Rely on file open flag to enable SWMR rather than manual start

Unidata · Mar 7, 2023 · ccdc9ff · ccdc9ff
1 parent cbbb873
commit ccdc9ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/libhdf5/hdf5create.c b/libhdf5/hdf5create.c
@@ -280,14 +280,6 @@ nc4_create_file(const char *path, int cmode, size_t initialsz,
     if ((retval = NC4_new_provenance(nc4_info)))
         BAIL(retval);
 
-#ifdef HDF5_HAS_SWMR
-    if ((cmode & NC_HDF5_SWMR)) {
-      /* Prepare for single writer multiple readers */
-      if ((retval = H5Fstart_swmr_write(hdf5_info->hdfid)))
-        BAIL(retval);
-    }
-#endif
-
     return NC_NOERR;
 
 exit: /*failure exit*/

diff --git a/libhdf5/hdf5open.c b/libhdf5/hdf5open.c
@@ -711,6 +711,11 @@ nc4_open_file(const char *path, int mode, void* parameters, int ncid)
     /* Determine the HDF5 open flag to use. */
     if((mode & NC_WRITE)) {
       flags = H5F_ACC_RDWR;
+#ifdef HDF5_HAS_SWMR
+      if((mode & NC_HDF5_SWMR)) {
+        flags |= H5F_ACC_SWMR_WRITE;
+      }
+#endif
     } else {
       flags = H5F_ACC_RDONLY;
 #ifdef HDF5_HAS_SWMR
@@ -1003,15 +1008,6 @@ nc4_open_file(const char *path, int mode, void* parameters, int ncid)
     if (H5Pclose(fapl_id) < 0)
         BAIL(NC_EHDFERR);
 
-#ifdef HDF5_HAS_SWMR
-    /* Prepare for single writer multiple reader. */
-    if (mode & NC_WRITE && mode & NC_HDF5_SWMR) {
-      if ((retval = H5Fstart_swmr_write(h5->hdfid))) {
-        BAIL(retval);
-      }
-    }
-#endif
-
     return NC_NOERR;
 
 exit: