Skip to content

Changes to internal library routines for structured chunk #5345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
26 changes: 17 additions & 9 deletions src/H5Dbtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static herr_t H5D__btree_idx_create(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__btree_idx_open(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__btree_idx_close(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__btree_idx_is_open(const H5D_chk_idx_info_t *idx_info, bool *is_open);
static bool H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage);
static bool H5D__btree_idx_is_space_alloc(const void *storage);
static herr_t H5D__btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata,
const H5D_t *dset);
static herr_t H5D__btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
Expand All @@ -126,11 +126,10 @@ static herr_t H5D__btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chun
static herr_t H5D__btree_idx_delete(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
const H5D_chk_idx_info_t *idx_info_dst);
static herr_t H5D__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
H5O_storage_chunk_t *storage_dst);
static herr_t H5D__btree_idx_copy_shutdown(void *storage_src, void *storage_dst);
static herr_t H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *size);
static herr_t H5D__btree_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr);
static herr_t H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream);
static herr_t H5D__btree_idx_reset(void *storage, bool reset_addr);
static herr_t H5D__btree_idx_dump(const void *storage, FILE *stream);
static herr_t H5D__btree_idx_dest(const H5D_chk_idx_info_t *idx_info);

/*********************/
Expand Down Expand Up @@ -948,8 +947,10 @@ H5D__btree_idx_is_open(const H5D_chk_idx_info_t *idx_info, bool *is_open)
*-------------------------------------------------------------------------
*/
static bool
H5D__btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
H5D__btree_idx_is_space_alloc(const void *store)
{
const H5O_storage_chunk_t *storage = (const H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

/* Check args */
Expand Down Expand Up @@ -1280,8 +1281,11 @@ H5D__btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk_
*-------------------------------------------------------------------------
*/
static herr_t
H5D__btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst)
H5D__btree_idx_copy_shutdown(void *store_src, void *store_dst)
{
H5O_storage_chunk_t *storage_src = (H5O_storage_chunk_t *)store_src;
H5O_storage_chunk_t *storage_dst = (H5O_storage_chunk_t *)store_dst;

herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE
Expand Down Expand Up @@ -1352,8 +1356,10 @@ H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
*-------------------------------------------------------------------------
*/
static herr_t
H5D__btree_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr)
H5D__btree_idx_reset(void *store, bool reset_addr)
{
H5O_storage_chunk_t *storage = (H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

assert(storage);
Expand All @@ -1376,8 +1382,10 @@ H5D__btree_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr)
*-------------------------------------------------------------------------
*/
static herr_t
H5D__btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
H5D__btree_idx_dump(const void *store, FILE *stream)
{
const H5O_storage_chunk_t *storage = (const H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

assert(storage);
Expand Down
25 changes: 17 additions & 8 deletions src/H5Dbtree2.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static herr_t H5D__bt2_idx_create(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__bt2_idx_open(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__bt2_idx_close(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__bt2_idx_is_open(const H5D_chk_idx_info_t *idx_info, bool *is_open);
static bool H5D__bt2_idx_is_space_alloc(const H5O_storage_chunk_t *storage);
static bool H5D__bt2_idx_is_space_alloc(const void *storage);
static herr_t H5D__bt2_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata,
const H5D_t *dset);
static herr_t H5D__bt2_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
Expand All @@ -129,10 +129,10 @@ static herr_t H5D__bt2_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_
static herr_t H5D__bt2_idx_delete(const H5D_chk_idx_info_t *idx_info);
static herr_t H5D__bt2_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
const H5D_chk_idx_info_t *idx_info_dst);
static herr_t H5D__bt2_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst);
static herr_t H5D__bt2_idx_copy_shutdown(void *storage_src, void *storage_dst);
static herr_t H5D__bt2_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *size);
static herr_t H5D__bt2_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr);
static herr_t H5D__bt2_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream);
static herr_t H5D__bt2_idx_reset(void *storage, bool reset_addr);
static herr_t H5D__bt2_idx_dump(const void *storage, FILE *stream);
static herr_t H5D__bt2_idx_dest(const H5D_chk_idx_info_t *idx_info);

/*********************/
Expand Down Expand Up @@ -831,8 +831,10 @@ H5D__bt2_idx_is_open(const H5D_chk_idx_info_t *idx_info, bool *is_open)
*-------------------------------------------------------------------------
*/
static bool
H5D__bt2_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
H5D__bt2_idx_is_space_alloc(const void *store)
{
const H5O_storage_chunk_t *storage = (const H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

/* Check args */
Expand Down Expand Up @@ -1404,8 +1406,11 @@ H5D__bt2_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src, const H5D_chk_id
*-------------------------------------------------------------------------
*/
static herr_t
H5D__bt2_idx_copy_shutdown(H5O_storage_chunk_t *storage_src, H5O_storage_chunk_t *storage_dst)
H5D__bt2_idx_copy_shutdown(void *store_src, void *store_dst)
{
H5O_storage_chunk_t *storage_src = (H5O_storage_chunk_t *)store_src;
H5O_storage_chunk_t *storage_dst = (H5O_storage_chunk_t *)store_dst;

herr_t ret_value = SUCCEED; /* Return value */

FUNC_ENTER_PACKAGE
Expand Down Expand Up @@ -1487,8 +1492,10 @@ H5D__bt2_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
*-------------------------------------------------------------------------
*/
static herr_t
H5D__bt2_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr)
H5D__bt2_idx_reset(void *store, bool reset_addr)
{
H5O_storage_chunk_t *storage = (H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

/* Sanity checks */
Expand All @@ -1512,8 +1519,10 @@ H5D__bt2_idx_reset(H5O_storage_chunk_t *storage, bool reset_addr)
*-------------------------------------------------------------------------
*/
static herr_t
H5D__bt2_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
H5D__bt2_idx_dump(const void *store, FILE *stream)
{
const H5O_storage_chunk_t *storage = (const H5O_storage_chunk_t *)store;

FUNC_ENTER_PACKAGE_NOERR

/* Sanity checks */
Expand Down
Loading