diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2016-11-17 22:25:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2016-11-17 22:25:28 (GMT) |
| commit | 248a93cde8d87dd3a8162831103b5358a166fed8 (patch) | |
| tree | 27d7fdccfef43d717754d102708b84fe29f6b962 /src/H5HLcache.c | |
| parent | fe849d26cd9b80df1e0e5203d050ad2ccea438c5 (diff) | |
| parent | be27e1ad79dfa0507f589b29d938b7e1020a5b2d (diff) | |
| download | hdf5-248a93cde8d87dd3a8162831103b5358a166fed8.zip hdf5-248a93cde8d87dd3a8162831103b5358a166fed8.tar.gz hdf5-248a93cde8d87dd3a8162831103b5358a166fed8.tar.bz2 | |
Merge pull request #162 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop_merge_revise_chunks_07 to develop
* commit 'be27e1ad79dfa0507f589b29d938b7e1020a5b2d':
Remove explicit support within the metadata cache for tracked compressed entries, they are now completely handled in the clients.
Diffstat (limited to 'src/H5HLcache.c')
| -rw-r--r-- | src/H5HLcache.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/H5HLcache.c b/src/H5HLcache.c index 95ab65d..a9a9851 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -74,9 +74,7 @@ static herr_t H5HL__cache_prefix_get_load_size(const void *udata, size_t *image_len); static void *H5HL__cache_prefix_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); -static herr_t H5HL__cache_prefix_image_len(const void *thing, - size_t *image_len, hbool_t *compressed_ptr, - size_t *compressed_image_len_ptr); +static herr_t H5HL__cache_prefix_image_len(const void *thing, size_t *image_len); static herr_t H5HL__cache_prefix_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5HL__cache_prefix_free_icr(void *thing); @@ -86,9 +84,7 @@ static herr_t H5HL__cache_datablock_get_load_size(const void *udata, size_t *image_len); static void *H5HL__cache_datablock_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty); -static herr_t H5HL__cache_datablock_image_len(const void *thing, - size_t *image_len, hbool_t *compressed_ptr, - size_t *compressed_image_len_ptr); +static herr_t H5HL__cache_datablock_image_len(const void *thing, size_t *image_len); static herr_t H5HL__cache_datablock_serialize(const H5F_t *f, void *image, size_t len, void *thing); static herr_t H5HL__cache_datablock_free_icr(void *thing); @@ -455,8 +451,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5HL__cache_prefix_image_len(const void *_thing, size_t *image_len, - hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr) +H5HL__cache_prefix_image_len(const void *_thing, size_t *image_len) { const H5HL_prfx_t *prfx = (const H5HL_prfx_t *)_thing; /* Pointer to local heap prefix to query */ @@ -480,10 +475,6 @@ H5HL__cache_prefix_image_len(const void *_thing, size_t *image_len, FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HL__cache_prefix_image_len() */ -/****************************************/ -/* no H5HL_cache_prefix_pre_serialize() */ -/****************************************/ - /*------------------------------------------------------------------------- * Function: H5HL__cache_prefix_serialize @@ -746,8 +737,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5HL__cache_datablock_image_len(const void *_thing, size_t *image_len, - hbool_t H5_ATTR_UNUSED *compressed_ptr, size_t H5_ATTR_UNUSED *compressed_image_len_ptr) +H5HL__cache_datablock_image_len(const void *_thing, size_t *image_len) { const H5HL_dblk_t *dblk = (const H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ @@ -766,10 +756,6 @@ H5HL__cache_datablock_image_len(const void *_thing, size_t *image_len, FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HL__cache_datablock_image_len() */ -/*******************************************/ -/* no H5HL_cache_datablock_pre_serialize() */ -/*******************************************/ - /*------------------------------------------------------------------------- * Function: H5HL__cache_datablock_serialize |