Manual sync with develop (#95)

Brings all features from develop. Note that RELEASE.txt has not been
updated (will be done in a future PR).

2 files changed, 55 insertions, 6 deletions

diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 3c5a124..1c37839 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -8518,6 +8518,55 @@ public class H5 implements java.io.Serializable {
     public synchronized static native void H5Pset_evict_on_close(long fapl_id, boolean evict_on_close)
             throws HDF5LibraryException;
 
+    /**
+     * H5Pget_use_file_locking retrieves whether we are using file locking.
+     *
+     * @param fapl_id
+     *            IN: File access property list identifier
+     *
+     * @return indication if file locking is used.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native boolean H5Pget_use_file_locking(long fapl_id)
+            throws HDF5LibraryException;
+
+    /**
+     * H5Pget_use_file_locking retrieves whether we ignore file locks when they are disabled.
+     *
+     * @param fapl_id
+     *            IN: File access property list identifier
+     *
+     * @return indication if file locking is ignored.
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native boolean H5Pget_ignore_disabled_file_locking(long fapl_id)
+            throws HDF5LibraryException;
+
+    /**
+     * H5Pset_file_locking sets parameters related to file locking.
+     *
+     * @param fapl_id
+     *            IN: File access property list identifier
+     *
+     * @param use_file_locking
+     *            IN: Whether the library will use file locking when opening files (mainly for SWMR semantics).
+     *
+     * @param ignore_when_disabled
+     *            IN: Whether file locking will be ignored when disabled on a file system (useful for Lustre).
+     *
+     * @exception HDF5LibraryException
+     *                - Error from the HDF-5 Library.
+     *
+     **/
+    public synchronized static native void H5Pset_file_locking(long fapl_id, boolean use_file_locking, boolean ignore_when_disabled)
+            throws HDF5LibraryException;
+
     //  /////  unimplemented /////
     // herr_t H5Pset_vol(hid_t plist_id, hid_t new_vol_id, const void *new_vol_info);
     // herr_t H5Pget_vol_id(hid_t plist_id, hid_t *vol_id);
diff --git a/java/src/hdf/hdf5lib/HDF5Constants.java b/java/src/hdf/hdf5lib/HDF5Constants.java
index 2241238..a4f17e6 100644
--- a/java/src/hdf/hdf5lib/HDF5Constants.java
+++ b/java/src/hdf/hdf5lib/HDF5Constants.java
@@ -215,8 +215,8 @@ public class HDF5Constants {
     public static final long H5E_CANTLOAD = H5E_CANTLOAD();
     /** Minor error codes - Resource errors - Unable to lock object */
     public static final long H5E_CANTLOCK = H5E_CANTLOCK();
-//    /** Minor error codes - File accessibility errors  Unable to lock file */
-//    public static final long H5E_CANTLOCKFILE = H5E_CANTLOCKFILE();
+    /** Minor error codes - File accessibility errors  Unable to lock file */
+    public static final long H5E_CANTLOCKFILE = H5E_CANTLOCKFILE();
     /** Minor error codes - Cache related errors - Unable to mark a pinned entry as clean */
     public static final long H5E_CANTMARKCLEAN = H5E_CANTMARKCLEAN();
     /** Minor error codes - Cache related errors - Unable to mark a pinned entry as dirty */
@@ -289,8 +289,8 @@ public class HDF5Constants {
     public static final long H5E_CANTUNDEPEND = H5E_CANTUNDEPEND();
     /** Minor error codes - Resource errors - Unable to unlock object */
     public static final long H5E_CANTUNLOCK = H5E_CANTUNLOCK();
-//    /** Minor error codes - File accessibility errors  Unable to unlock file */
-//    public static final long H5E_CANTUNLOCKFILE = H5E_CANTUNLOCKFILE();
+    /** Minor error codes - File accessibility errors  Unable to unlock file */
+    public static final long H5E_CANTUNLOCKFILE = H5E_CANTUNLOCKFILE();
     /** Minor error codes - Cache related errors - Unable to un-pin cache entry */
     public static final long H5E_CANTUNPIN = H5E_CANTUNPIN();
     /** Minor error codes - Cache related errors - Unable to unprotect metadata */
@@ -1262,7 +1262,7 @@ public class HDF5Constants {
 
     private static native final long H5E_CANTLOCK();
 
-//    private static native final long H5E_CANTLOCKFILE();
+    private static native final long H5E_CANTLOCKFILE();
 
     private static native final long H5E_CANTMARKCLEAN();
 
@@ -1336,7 +1336,7 @@ public class HDF5Constants {
 
     private static native final long H5E_CANTUNLOCK();
 
-//    private static native final long H5E_CANTUNLOCKFILE();
+    private static native final long H5E_CANTUNLOCKFILE();
 
     private static native final long H5E_CANTUNPIN();