Bring over support for retrying metadata cache entry loads, along with all the

supporting metadata cache callback changes, etc.

1 files changed, 11 insertions, 12 deletions

diff --git a/test/earray.c b/test/earray.c
index 17daefd..07acbb5 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -160,9 +160,7 @@ typedef struct earray_test_t {
 /* Local prototypes */
 
 /* Metadata cache (H5AC) callbacks */
-
-static herr_t earray_cache_test_get_load_size(const void *udata_ptr,
-                                              size_t *image_len_ptr);
+static herr_t earray_cache_test_get_initial_load_size(void *udata, size_t *image_len);
 static void *earray_cache_test_deserialize(const void *image_ptr, size_t len,
     void *udata_ptr, hbool_t *dirty_ptr);
 static herr_t earray_cache_test_image_len(const void *thing, size_t *image_len_ptr);
@@ -190,7 +188,9 @@ const H5AC_class_t H5AC_EARRAY_TEST[1] = {{
     /* name          */ "earray test",
     /* mem_type      */ H5FD_MEM_DEFAULT,
     /* flags         */ H5AC__CLASS_SKIP_READS | H5AC__CLASS_SKIP_WRITES,
-    /* get_load_size */ earray_cache_test_get_load_size,
+    /* get_initial_load_size */ earray_cache_test_get_initial_load_size,
+    /* get_final_load_size */ NULL,
+    /* verify_chksum */ NULL,
     /* deserialize   */ earray_cache_test_deserialize,
     /* image_len     */ earray_cache_test_image_len,
     /* pre_serialize */ NULL,
@@ -619,13 +619,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    earray_cache_test_get_load_size()
+ * Function:    earray_cache_test_get_initial_load_size()
  *
  * Purpose: place holder function -- should never be called
  *
- *
  *      A generic discussion of metadata cache callbacks of this type
- *      may be found in H5Cprivate.h:
+ *      may be found in H5Cprivate.h.
  *
  * Return:      Success:        SUCCEED
  *              Failure:        FAIL
@@ -636,18 +635,18 @@ error:
  *-------------------------------------------------------------------------
  */
 static herr_t
-earray_cache_test_get_load_size(const void *udata_ptr, size_t *image_len_ptr)
+earray_cache_test_get_initial_load_size( void *udata, size_t *image_len)
 {
-    HDassert(udata_ptr);
-    HDassert(image_len_ptr);
+    HDassert(udata);
+    HDassert(image_len);
 
     /* Should never be called */
     HDassert(0 && "Can't be called!");
 
-    *image_len_ptr = 0;
+    *image_len = 0;
 
     return(SUCCEED);
-} /* end earray_cache_test_get_load_size() */
+} /* end earray_cache_test_get_initial_load_size() */
 
 
 /*-------------------------------------------------------------------------