Intermin commit to allow update from Vailin's recent changes

1 files changed, 22 insertions, 0 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index d7f5002..a2ec13b 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -278,6 +278,11 @@ H5AC_cache_image_pending(const H5F_t *f)
  *              matzke@llnl.gov
  *              Jul  9 1997
  *
+ * Changes:     Added code to configrue the metadata cache for VFD SWMR
+ *              reader operations when indicated.
+ *
+ *                                              JRM -- 1/15/19
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -418,6 +423,23 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unable to emit log message")
     } /* end if */
 
+    /* Configure the metadata cache for VFD SWMR reader operation if 
+     * specified.
+     */
+    if ( ( H5F_VFD_SWMR_CONFIG(f) ) && 
+         ( !f->shared->vfd_swmr_config.vfd_swmr_writer ) ) {
+
+        HDassert(!(H5F_INTENT(f) & H5F_ACC_RDWR));
+        HDassert(f->shared->fs_page_size > 0);
+
+        if ( H5C_set_vfd_swmr_reader(f->shared->cache, TRUE, 
+                                     f->shared->fs_page_size) < 0 )
+
+            HGOTO_ERROR(H5E_CACHE, H5E_CANTSET, FAIL, \
+                        "can't configure MDC for VFD SWMR reader operations");
+
+    }
+
     /* Set the cache parameters */
     if(H5AC_set_cache_auto_resize_config(f->shared->cache, config_ptr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTSET, FAIL, "auto resize configuration failed")