diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-12-29 10:40:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-12-29 10:40:26 (GMT) |
| commit | da2f1610d1f2cba40770aee6d0d6fbc8196645ae (patch) | |
| tree | 7089a182a8aaab3c614edb4a29a65514087b722c /src/H5HFcache.c | |
| parent | 6a8222b6a54da80737186d27c54078ac303c92a0 (diff) | |
| download | hdf5-da2f1610d1f2cba40770aee6d0d6fbc8196645ae.zip hdf5-da2f1610d1f2cba40770aee6d0d6fbc8196645ae.tar.gz hdf5-da2f1610d1f2cba40770aee6d0d6fbc8196645ae.tar.bz2 | |
More normalizations against incoming cache image branch.
Diffstat (limited to 'src/H5HFcache.c')
| -rw-r--r-- | src/H5HFcache.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c index 04f1459..f85b344 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -97,7 +97,7 @@ static herr_t H5HF__cache_iblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, unsigned *flags); static herr_t H5HF__cache_iblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); -static herr_t H5HF__cache_iblock_notify(H5C_notify_action_t action, void *thing); +static herr_t H5HF__cache_iblock_notify(H5AC_notify_action_t action, void *thing); static herr_t H5HF__cache_iblock_free_icr(void *thing); static herr_t H5HF__cache_dblock_get_initial_load_size(void *udata, size_t *image_len); @@ -110,7 +110,7 @@ static herr_t H5HF__cache_dblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, unsigned *flags); static herr_t H5HF__cache_dblock_serialize(const H5F_t *f, void *image, size_t len, void *thing); -static herr_t H5HF__cache_dblock_notify(H5C_notify_action_t action, void *thing); +static herr_t H5HF__cache_dblock_notify(H5AC_notify_action_t action, void *thing); static herr_t H5HF__cache_dblock_free_icr(void *thing); /* Debugging Function Prototypes */ @@ -1253,7 +1253,7 @@ H5HF__cache_iblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *_thing, } /* end if */ *new_addr = iblock_addr; - *flags = H5C__SERIALIZE_MOVED_FLAG; + *flags = H5AC__SERIALIZE_MOVED_FLAG; } /* end if */ else *flags = 0; @@ -1400,7 +1400,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t len, *------------------------------------------------------------------------- */ static herr_t -H5HF__cache_iblock_notify(H5C_notify_action_t action, void *_thing) +H5HF__cache_iblock_notify(H5AC_notify_action_t action, void *_thing) { H5HF_indirect_t *iblock = (H5HF_indirect_t *)_thing; /* Indirect block info */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2345,12 +2345,12 @@ H5HF__cache_dblock_pre_serialize(const H5F_t *f, hid_t dxpl_id, void *_thing, /* finally, pass data back to the metadata cache as appropriate */ if(!H5F_addr_eq(addr, dblock_addr)) { - dblock_flags |= H5C__SERIALIZE_MOVED_FLAG; + dblock_flags |= H5AC__SERIALIZE_MOVED_FLAG; *new_addr = dblock_addr; } /* end if */ if((hdr->filter_len > 0) && (len != write_size)) { - dblock_flags |= H5C__SERIALIZE_RESIZED_FLAG; + dblock_flags |= H5AC__SERIALIZE_RESIZED_FLAG; *new_len = write_size; } /* end if */ @@ -2444,7 +2444,7 @@ H5HF__cache_dblock_serialize(const H5F_t *f, void *image, size_t len, *------------------------------------------------------------------------- */ static herr_t -H5HF__cache_dblock_notify(H5C_notify_action_t action, void *_thing) +H5HF__cache_dblock_notify(H5AC_notify_action_t action, void *_thing) { H5HF_direct_t *dblock = (H5HF_direct_t *)_thing; /* Fractal heap direct block */ herr_t ret_value = SUCCEED; /* Return value */ |