summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-11-17 20:58:04 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-11-17 20:58:04 (GMT)
commitbe27e1ad79dfa0507f589b29d938b7e1020a5b2d (patch)
tree27d7fdccfef43d717754d102708b84fe29f6b962 /test
parentfe849d26cd9b80df1e0e5203d050ad2ccea438c5 (diff)
downloadhdf5-be27e1ad79dfa0507f589b29d938b7e1020a5b2d.zip
hdf5-be27e1ad79dfa0507f589b29d938b7e1020a5b2d.tar.gz
hdf5-be27e1ad79dfa0507f589b29d938b7e1020a5b2d.tar.bz2
Remove explicit support within the metadata cache for tracked compressed
entries, they are now completely handled in the clients.
Diffstat (limited to 'test')
-rw-r--r--test/cache_common.c338
-rw-r--r--test/earray.c62
2 files changed, 162 insertions, 238 deletions
diff --git a/test/cache_common.c b/test/cache_common.c
index 94034eb..247ac57 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -111,62 +111,51 @@ static void *variable_deserialize(const void *image_ptr, size_t len, void *udata
static void *notify_deserialize(const void *image_ptr, size_t len, void *udata_ptr,
hbool_t *dirty_ptr);
-static herr_t pico_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t nano_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t micro_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t tiny_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t small_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t medium_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t large_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t huge_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t monster_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t variable_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
-static herr_t notify_image_len(void *thing, size_t *image_len_ptr,
- hbool_t *compressed_ptr, size_t * compressed_len_ptr);
+static herr_t pico_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t nano_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t micro_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t tiny_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t small_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t medium_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t large_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t huge_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t monster_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t variable_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t notify_image_len(const void *thing, size_t *image_len_ptr);
static herr_t pico_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t nano_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t micro_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t tiny_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t small_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t medium_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t large_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t huge_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t monster_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t variable_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t notify_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
- haddr_t addr, size_t len, size_t compressed_len, haddr_t *new_addr_ptr,
- size_t *new_len_ptr, size_t *new_compressed_len_ptr, unsigned *flags_ptr);
+ haddr_t addr, size_t len, haddr_t *new_addr_ptr,
+ size_t *new_len_ptr, unsigned *flags_ptr);
static herr_t pico_serialize(const H5F_t *f, void *image_ptr,
size_t len, void *thing);
@@ -214,7 +203,7 @@ static herr_t get_load_size(const void *udata_ptr, size_t *image_len_ptr,
int32_t entry_type);
static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr,
hbool_t *dirty_ptr, int32_t entry_type);
-static herr_t image_len(void *thing, size_t *image_len_ptr, int32_t entry_type);
+static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type);
static herr_t pre_serialize(const H5F_t *f, hid_t dxpl_id, void *thing,
haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr,
unsigned *flags_ptr);
@@ -317,165 +306,165 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
"pico_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)pico_get_load_size,
- (H5C_deserialize_func_t)pico_deserialize,
- (H5C_image_len_func_t)pico_image_len,
- (H5AC_pre_serialize_func_t)pico_pre_serialize,
- (H5C_serialize_func_t)pico_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)pico_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ pico_get_load_size,
+ pico_deserialize,
+ pico_image_len,
+ pico_pre_serialize,
+ pico_serialize,
+ NULL,
+ pico_free_icr,
+ NULL,
+ NULL,
},
{
NANO_ENTRY_TYPE,
"nano_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)nano_get_load_size,
- (H5C_deserialize_func_t)nano_deserialize,
- (H5C_image_len_func_t)nano_image_len,
- (H5AC_pre_serialize_func_t)nano_pre_serialize,
- (H5C_serialize_func_t)nano_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)nano_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ nano_get_load_size,
+ nano_deserialize,
+ nano_image_len,
+ nano_pre_serialize,
+ nano_serialize,
+ NULL,
+ nano_free_icr,
+ NULL,
+ NULL,
},
{
MICRO_ENTRY_TYPE,
"micro_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)micro_get_load_size,
- (H5C_deserialize_func_t)micro_deserialize,
- (H5C_image_len_func_t)micro_image_len,
- (H5AC_pre_serialize_func_t)micro_pre_serialize,
- (H5C_serialize_func_t)micro_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)micro_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ micro_get_load_size,
+ micro_deserialize,
+ micro_image_len,
+ micro_pre_serialize,
+ micro_serialize,
+ NULL,
+ micro_free_icr,
+ NULL,
+ NULL,
},
{
TINY_ENTRY_TYPE,
"tiny_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)tiny_get_load_size,
- (H5C_deserialize_func_t)tiny_deserialize,
- (H5C_image_len_func_t)tiny_image_len,
- (H5AC_pre_serialize_func_t)tiny_pre_serialize,
- (H5C_serialize_func_t)tiny_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)tiny_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ tiny_get_load_size,
+ tiny_deserialize,
+ tiny_image_len,
+ tiny_pre_serialize,
+ tiny_serialize,
+ NULL,
+ tiny_free_icr,
+ NULL,
+ NULL,
},
{
SMALL_ENTRY_TYPE,
"small_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)small_get_load_size,
- (H5C_deserialize_func_t)small_deserialize,
- (H5C_image_len_func_t)small_image_len,
- (H5AC_pre_serialize_func_t)small_pre_serialize,
- (H5C_serialize_func_t)small_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)small_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ small_get_load_size,
+ small_deserialize,
+ small_image_len,
+ small_pre_serialize,
+ small_serialize,
+ NULL,
+ small_free_icr,
+ NULL,
+ NULL,
},
{
MEDIUM_ENTRY_TYPE,
"medium_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)medium_get_load_size,
- (H5C_deserialize_func_t)medium_deserialize,
- (H5C_image_len_func_t)medium_image_len,
- (H5AC_pre_serialize_func_t)medium_pre_serialize,
- (H5C_serialize_func_t)medium_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)medium_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ medium_get_load_size,
+ medium_deserialize,
+ medium_image_len,
+ medium_pre_serialize,
+ medium_serialize,
+ NULL,
+ medium_free_icr,
+ NULL,
+ NULL,
},
{
LARGE_ENTRY_TYPE,
"large_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)large_get_load_size,
- (H5C_deserialize_func_t)large_deserialize,
- (H5C_image_len_func_t)large_image_len,
- (H5AC_pre_serialize_func_t)large_pre_serialize,
- (H5C_serialize_func_t)large_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)large_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ large_get_load_size,
+ large_deserialize,
+ large_image_len,
+ large_pre_serialize,
+ large_serialize,
+ NULL,
+ large_free_icr,
+ NULL,
+ NULL,
},
{
HUGE_ENTRY_TYPE,
"huge_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)huge_get_load_size,
- (H5C_deserialize_func_t)huge_deserialize,
- (H5C_image_len_func_t)huge_image_len,
- (H5AC_pre_serialize_func_t)huge_pre_serialize,
- (H5C_serialize_func_t)huge_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)huge_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ huge_get_load_size,
+ huge_deserialize,
+ huge_image_len,
+ huge_pre_serialize,
+ huge_serialize,
+ NULL,
+ huge_free_icr,
+ NULL,
+ NULL,
},
{
MONSTER_ENTRY_TYPE,
"monster_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)monster_get_load_size,
- (H5C_deserialize_func_t)monster_deserialize,
- (H5C_image_len_func_t)monster_image_len,
- (H5AC_pre_serialize_func_t)monster_pre_serialize,
- (H5C_serialize_func_t)monster_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)monster_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ monster_get_load_size,
+ monster_deserialize,
+ monster_image_len,
+ monster_pre_serialize,
+ monster_serialize,
+ NULL,
+ monster_free_icr,
+ NULL,
+ NULL,
},
{
VARIABLE_ENTRY_TYPE,
"variable_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_SPECULATIVE_LOAD_FLAG,
- (H5C_get_load_size_func_t)variable_get_load_size,
- (H5C_deserialize_func_t)variable_deserialize,
- (H5C_image_len_func_t)variable_image_len,
- (H5AC_pre_serialize_func_t)variable_pre_serialize,
- (H5C_serialize_func_t)variable_serialize,
- (H5C_notify_func_t)NULL,
- (H5C_free_icr_func_t)variable_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ variable_get_load_size,
+ variable_deserialize,
+ variable_image_len,
+ variable_pre_serialize,
+ variable_serialize,
+ NULL,
+ variable_free_icr,
+ NULL,
+ NULL,
},
{
NOTIFY_ENTRY_TYPE,
"notify_entry",
H5FD_MEM_DEFAULT,
H5C__CLASS_NO_FLAGS_SET,
- (H5C_get_load_size_func_t)notify_get_load_size,
- (H5C_deserialize_func_t)notify_deserialize,
- (H5C_image_len_func_t)notify_image_len,
- (H5AC_pre_serialize_func_t)notify_pre_serialize,
- (H5C_serialize_func_t)notify_serialize,
- (H5C_notify_func_t)notify_notify,
- (H5C_free_icr_func_t)notify_free_icr,
- (H5C_clear_func_t)NULL,
- (H5C_get_fsf_size_t)NULL,
+ notify_get_load_size,
+ notify_deserialize,
+ notify_image_len,
+ notify_pre_serialize,
+ notify_serialize,
+ notify_notify,
+ notify_free_icr,
+ NULL,
+ NULL,
}
};
@@ -872,9 +861,9 @@ notify_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty)
*-------------------------------------------------------------------------
*/
herr_t
-image_len(void *thing, size_t *image_length, int32_t entry_type)
+image_len(const void *thing, size_t *image_length, int32_t entry_type)
{
- test_entry_t *entry;
+ const test_entry_t *entry;
test_entry_t *base_addr;
int32_t type;
int32_t idx;
@@ -882,7 +871,7 @@ image_len(void *thing, size_t *image_length, int32_t entry_type)
HDassert(thing);
HDassert(image_length);
- entry = (test_entry_t *)thing;
+ entry = (const test_entry_t *)thing;
HDassert(entry->self == entry);
@@ -909,78 +898,67 @@ image_len(void *thing, size_t *image_length, int32_t entry_type)
} /* image_len() */
herr_t
-pico_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+pico_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, PICO_ENTRY_TYPE);
}
herr_t
-nano_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+nano_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, NANO_ENTRY_TYPE);
}
herr_t
-micro_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+micro_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, MICRO_ENTRY_TYPE);
}
herr_t
-tiny_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+tiny_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, TINY_ENTRY_TYPE);
}
herr_t
-small_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+small_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, SMALL_ENTRY_TYPE);
}
herr_t
-medium_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+medium_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, MEDIUM_ENTRY_TYPE);
}
herr_t
-large_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+large_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, LARGE_ENTRY_TYPE);
}
herr_t
-huge_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+huge_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, HUGE_ENTRY_TYPE);
}
herr_t
-monster_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+monster_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, MONSTER_ENTRY_TYPE);
}
herr_t
-variable_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+variable_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, VARIABLE_ENTRY_TYPE);
}
herr_t
-notify_image_len(void *thing, size_t *image_length,
- hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_len_ptr)
+notify_image_len(const void *thing, size_t *image_length)
{
return image_len(thing, image_length, NOTIFY_ENTRY_TYPE);
}
@@ -1095,10 +1073,8 @@ pico_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1111,10 +1087,8 @@ nano_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1127,10 +1101,8 @@ micro_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1143,10 +1115,8 @@ tiny_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1159,10 +1129,8 @@ small_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1175,10 +1143,8 @@ medium_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1191,10 +1157,8 @@ large_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1207,10 +1171,8 @@ huge_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1223,10 +1185,8 @@ monster_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1239,10 +1199,8 @@ variable_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
@@ -1255,10 +1213,8 @@ notify_pre_serialize(const H5F_t *f,
void *thing,
haddr_t addr,
size_t len,
- size_t H5_ATTR_UNUSED compressed_len,
haddr_t *new_addr_ptr,
size_t *new_len_ptr,
- size_t H5_ATTR_UNUSED *new_compressed_len_ptr,
unsigned *flags_ptr)
{
return pre_serialize(f, dxpl_id, thing, addr, len,
diff --git a/test/earray.c b/test/earray.c
index 44d16c5..5211b97 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -163,22 +163,11 @@ typedef struct earray_test_t {
static herr_t earray_cache_test_get_load_size(const void *udata_ptr,
size_t *image_len_ptr);
-
-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,
- hbool_t *compressed_ptr,
- size_t * compressed_len_ptr);
-
-static herr_t earray_cache_test_serialize(const H5F_t *f,
- void *image_ptr,
- size_t len,
- void *thing);
-
+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);
+static herr_t earray_cache_test_serialize(const H5F_t *f, void *image_ptr,
+ size_t len, void *thing);
static herr_t earray_cache_test_free_icr(void *thing);
@@ -201,13 +190,13 @@ 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 */ (H5AC_get_load_size_func_t)earray_cache_test_get_load_size,
- /* deserialize */ (H5AC_deserialize_func_t)earray_cache_test_deserialize,
- /* image_len */ (H5AC_image_len_func_t)earray_cache_test_image_len,
- /* pre_serialize */ (H5AC_pre_serialize_func_t)NULL,
- /* serialize */ (H5AC_serialize_func_t)earray_cache_test_serialize,
- /* notify */ (H5AC_notify_func_t)NULL,
- /* free_icr */ (H5AC_free_icr_func_t)earray_cache_test_free_icr,
+ /* get_load_size */ earray_cache_test_get_load_size,
+ /* deserialize */ earray_cache_test_deserialize,
+ /* image_len */ earray_cache_test_image_len,
+ /* pre_serialize */ NULL,
+ /* serialize */ earray_cache_test_serialize,
+ /* notify */ NULL,
+ /* free_icr */ earray_cache_test_free_icr,
/* clear */ NULL,
/* fsf_size */ NULL,
}};
@@ -659,7 +648,6 @@ earray_cache_test_get_load_size(const void *udata_ptr, size_t *image_len_ptr)
*image_len_ptr = 0;
return(SUCCEED);
-
} /* end earray_cache_test_get_load_size() */
@@ -691,12 +679,10 @@ earray_cache_test_deserialize(const void *image_ptr,
HDassert(udata_ptr);
HDassert(dirty_ptr);
-
/* Should never be called */
HDassert(0 && "Can't be called!");
return(NULL);
-
} /* end earray_cache_test_deserialize() */
@@ -719,10 +705,8 @@ earray_cache_test_deserialize(const void *image_ptr,
*-------------------------------------------------------------------------
*/
static herr_t
-earray_cache_test_image_len(const void *thing, size_t *image_len_ptr,
- hbool_t H5_ATTR_UNUSED * compressed_ptr, size_t H5_ATTR_UNUSED * compressed_len_ptr)
+earray_cache_test_image_len(const void *thing, size_t *image_len_ptr)
{
-
HDassert(thing);
HDassert(image_len_ptr);
@@ -731,14 +715,9 @@ earray_cache_test_image_len(const void *thing, size_t *image_len_ptr,
*image_len_ptr = 1;
return(SUCCEED);
-
} /* end earray_cache_test_image_len() */
-/********************************/
-/* no H5O_cache_pre_serialize() */
-/********************************/
-
/*-------------------------------------------------------------------------
* Function: earray_cache_test_serialize
@@ -764,14 +743,12 @@ earray_cache_test_serialize(const H5F_t *f,
H5_ATTR_UNUSED size_t len,
void *thing)
{
- earray_test_t *test = NULL;
+ earray_test_t *test;
HDassert(f);
HDassert(image_ptr);
HDassert(thing);
-
test = (earray_test_t *)thing;
-
HDassert(test);
HDassert(test->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
HDassert((const H5AC_class_t *)(test->cache_info.type) ==
@@ -814,16 +791,10 @@ earray_cache_test_serialize(const H5F_t *f,
return(SUCCEED);
error:
-
return(FAIL);
-
} /* end earray_cache_test_serialize() */
-/******************************************/
-/* no earray_cache_test_notify() function */
-/******************************************/
-
/*-------------------------------------------------------------------------
* Function: earray_cache_test_free_icr
@@ -846,12 +817,10 @@ error:
static herr_t
earray_cache_test_free_icr(void *thing)
{
- earray_test_t *test = NULL;
+ earray_test_t *test;
HDassert(thing);
-
test = (earray_test_t *)thing;
-
HDassert(test);
/* the metadata cache sets cache_info.magic to
@@ -867,7 +836,6 @@ earray_cache_test_free_icr(void *thing)
HDfree(test);
return(SUCCEED);
-
} /* end earray_cache_test_free_icr() */