Fixes phdf5

8 files changed, 22 insertions, 48 deletions

diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index a18b658..1ae6cc4 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -15,7 +15,7 @@
  *
  * Created:             H5ACmpio.c
  *                      Jun 20 2015
- *                      Quincey Koziol <koziol@hdfgroup.org>
+ *                      Quincey Koziol
  *
  * Purpose:             Functions in this file implement support for parallel
  *                      I/O cache functionality
@@ -482,7 +482,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5AC__construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t H5_ATTR_SANITY_CHECK *aux_ptr, int sync_point_op)
+H5AC__construct_candidate_list(H5AC_t *cache_ptr, H5AC_aux_t H5_ATTR_NDEBUG_UNUSED *aux_ptr,
+                               int sync_point_op)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
diff --git a/src/H5C.c b/src/H5C.c
index 2ccf75a..845d90b 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1792,7 +1792,6 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
          */
 
         if (H5C__make_space_in_cache(f, space_needed, write_permitted) < 0)
-
             HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C__make_space_in_cache failed")
     } /* end if */
 
@@ -1821,45 +1820,18 @@ H5C_insert_entry(H5F_t *f, const H5C_class_t *type, haddr_t addr, void *thing, u
     H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)
 
 #ifdef H5_HAVE_PARALLEL
-    if (H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI)) {
-
-        coll_access = (H5P_USER_TRUE == f->coll_md_read ? TRUE : FALSE);
-
-        /* If not explicitly disabled, get the cmdr setting from the
-         * API context
-         */
-        if (!coll_access && H5P_FORCE_FALSE != f->coll_md_read) {
-
-            coll_access = H5CX_get_coll_metadata_read();
-        }
-    } /* end if */
+    if (H5F_HAS_FEATURE(f, H5FD_FEAT_HAS_MPI))
+        coll_access = H5CX_get_coll_metadata_read();
 
     entry_ptr->coll_access = coll_access;
-
     if (coll_access) {
         H5C__INSERT_IN_COLL_LIST(cache_ptr, entry_ptr, FAIL)
 
-        /* Make sure the size of the collective entries in the cache
-         * remain in check
-         */
-        if (H5P_USER_TRUE == f->coll_md_read) {
-
-            if (cache_ptr->max_cache_size * 80 < cache_ptr->coll_list_size * 100) {
-
-                if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0)
-
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries")
-            } /* end if */
-        }     /* end if */
-        else {
-            if (cache_ptr->max_cache_size * 40 < cache_ptr->coll_list_size * 100) {
-
-                if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0)
-
-                    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries")
-            } /* end if */
-        }     /* end else */
-    }         /* end if */
+        /* Make sure the size of the collective entries in the cache remain in check */
+        if (cache_ptr->max_cache_size * 80 < cache_ptr->coll_list_size * 100)
+            if (H5C_clear_coll_entries(cache_ptr, TRUE) < 0)
+                HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "can't clear collective metadata entries")
+    } /* end if */
 #endif
 
 done:
@@ -1874,7 +1846,6 @@ done:
             HDONE_ERROR(H5E_CACHE, H5E_CANTREMOVE, FAIL, "can't remove entry from tag list")
 
     FUNC_LEAVE_NOAPI(ret_value)
-
 } /* H5C_insert_entry() */
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5CX.c b/src/H5CX.c
index ba86e4a..f3a5eef 100644
--- a/src/H5CX.c
+++ b/src/H5CX.c
@@ -11,7 +11,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Quincey Koziol <koziol@lbl.gov>
+ * Programmer:  Quincey Koziol
  *              Monday, February 19, 2018
  *
  * Purpose:
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 362fe1e..5783a72 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -5694,7 +5694,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
     /* Set it in the userdata to return */
     udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr;
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(H5_ITER_CONT)
 } /* H5D__chunk_addrmap_cb() */
 
 /*-------------------------------------------------------------------------
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index d0c3bb5..c73d032 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -2186,7 +2186,7 @@ datum_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr)
  *-------------------------------------------------------------------------
  */
 static void *
-datum_deserialize(const void H5_ATTR_SANITY_CHECK *image_ptr, H5_ATTR_UNUSED size_t len, void *udata_ptr,
+datum_deserialize(const void H5_ATTR_NDEBUG_UNUSED *image_ptr, H5_ATTR_UNUSED size_t len, void *udata_ptr,
                   hbool_t *dirty_ptr)
 {
     haddr_t       addr    = *(haddr_t *)udata_ptr;
@@ -2289,7 +2289,7 @@ datum_image_len(const void *thing, size_t *image_len)
  *-------------------------------------------------------------------------
  */
 static herr_t
-datum_serialize(const H5F_t *f, void H5_ATTR_SANITY_CHECK *image_ptr, size_t len, void *thing_ptr)
+datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t len, void *thing_ptr)
 {
     herr_t             ret_value = SUCCEED;
     int                idx;
diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c
index ec6d0cc..4ca38f7 100644
--- a/testpar/t_cache_image.c
+++ b/testpar/t_cache_image.c
@@ -1138,12 +1138,12 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons
      */
     if (pass) {
 
-        if ((file_ptr->shared->page_buf) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) {
+        if ((file_ptr->shared->pb_ptr) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) {
 
             pass         = FALSE;
             failure_mssg = "page buffer unexepectedly enabled.";
         }
-        else if ((file_ptr->shared->page_buf != NULL) &&
+        else if ((file_ptr->shared->pb_ptr != NULL) &&
                  ((enable_page_buffer) || (l_facc_type != FACC_MPIO))) {
 
             pass         = FALSE;
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 8bef7ae..2c9bd03 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -116,6 +116,7 @@ test_split_comm_access(void)
     VRFY((mrc == MPI_SUCCESS), "final MPI_Barrier succeeded");
 }
 
+#if 0
 void
 test_page_buffer_access(void)
 {
@@ -430,6 +431,7 @@ test_page_buffer_access(void)
     data = NULL;
     MPI_Barrier(MPI_COMM_WORLD);
 }
+#endif
 
 static int
 create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_strategy)
@@ -637,9 +639,9 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t
 
     MPI_Barrier(MPI_COMM_WORLD);
 
-    VRFY((f->shared->page_buf != NULL), "");
-    VRFY((f->shared->page_buf->page_size == page_size), "");
-    VRFY((f->shared->page_buf->max_size == page_buffer_size), "");
+    VRFY((f->shared->pb_ptr!= NULL), "");
+    VRFY((f->shared->pb_ptr->page_size == page_size), "");
+    VRFY((f->shared->pb_ptr->max_size == page_buffer_size), "");
 
     grp_id = H5Gopen2(file_id, "GROUP", H5P_DEFAULT);
     VRFY((grp_id >= 0), "");
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 37f7040..54accc1 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -247,7 +247,7 @@ void collective_group_write(void);
 void independent_group_read(void);
 void test_fapl_mpio_dup(void);
 void test_split_comm_access(void);
-void test_page_buffer_access(void);
+//void test_page_buffer_access(void);
 void dataset_atomicity(void);
 void dataset_writeInd(void);
 void dataset_writeAll(void);