summaryrefslogtreecommitdiffstats
path: root/test/mf.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/mf.c')
-rw-r--r--test/mf.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/test/mf.c b/test/mf.c
index 315295d..9dfdcb9 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -999,7 +999,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
check_addr = H5MF_alloc_tmp(f, (hsize_t)(maxaddr / 3));
}
H5E_END_TRY;
- if (H5F_addr_defined(check_addr))
+ if (H5_addr_defined(check_addr))
TEST_ERROR;
/* Test that pushing normal space allocation into temporary space fails */
@@ -1008,7 +1008,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
check_addr = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)(maxaddr / 3));
}
H5E_END_TRY;
- if (H5F_addr_defined(check_addr))
+ if (H5_addr_defined(check_addr))
TEST_ERROR;
/* Free the normal block (so the file doesn't blow up to a huge size) */
@@ -6401,7 +6401,7 @@ test_mf_fs_persist_split(void)
FAIL_STACK_ERROR;
/* Verify that the H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[type]))
+ if (!H5_addr_defined(f->shared->fs_addr[type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -6425,7 +6425,7 @@ test_mf_fs_persist_split(void)
TEST_ERROR;
/* Verify that the free-space manager for H5FD_MEM_DRAW is there */
- if (!H5F_addr_defined(f->shared->fs_addr[stype]))
+ if (!H5_addr_defined(f->shared->fs_addr[stype]))
TEST_ERROR;
/* Start up H5FD_MEM_DRAW free-space manager */
@@ -6485,11 +6485,11 @@ test_mf_fs_persist_split(void)
FAIL_STACK_ERROR;
/* Verify that the free-space manager for H5FD_MEM_DRAW is not there */
- if (H5F_addr_defined(f->shared->fs_addr[stype]))
+ if (H5_addr_defined(f->shared->fs_addr[stype]))
TEST_ERROR;
/* Verify that the free-space manager for H5FD_MEM_SUPER is there */
- if (!H5F_addr_defined(f->shared->fs_addr[type]))
+ if (!H5_addr_defined(f->shared->fs_addr[type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -6529,7 +6529,7 @@ test_mf_fs_persist_split(void)
FAIL_STACK_ERROR;
/* Verify that the H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[type]))
+ if (!H5_addr_defined(f->shared->fs_addr[type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -6719,7 +6719,7 @@ test_mf_fs_persist_multi(void)
FAIL_STACK_ERROR;
/* Verify that the H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[type]))
+ if (!H5_addr_defined(f->shared->fs_addr[type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -6743,7 +6743,7 @@ test_mf_fs_persist_multi(void)
TEST_ERROR;
/* Verify that the free-space manager for H5FD_MEM_DRAW is there */
- if (!H5F_addr_defined(f->shared->fs_addr[stype]))
+ if (!H5_addr_defined(f->shared->fs_addr[stype]))
TEST_ERROR;
/* Start up H5FD_MEM_DRAW free-space manager */
@@ -6801,7 +6801,7 @@ test_mf_fs_persist_multi(void)
FAIL_STACK_ERROR;
/* Verify that the free-space manager for H5FD_MEM_SUPER is there */
- if (!H5F_addr_defined(f->shared->fs_addr[type]))
+ if (!H5_addr_defined(f->shared->fs_addr[type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -6823,11 +6823,11 @@ test_mf_fs_persist_multi(void)
TEST_ERROR;
/* Verify that the free-space manager for H5FD_MEM_DRAW is not there */
- if (H5F_addr_defined(f->shared->fs_addr[stype]))
+ if (H5_addr_defined(f->shared->fs_addr[stype]))
TEST_ERROR;
/* Verify that the free-space manager for H5FD_MEM_BTREE is there */
- if (!H5F_addr_defined(f->shared->fs_addr[btype]))
+ if (!H5_addr_defined(f->shared->fs_addr[btype]))
TEST_ERROR;
/* Start up H5FD_MEM_BTREE free-space manager */
@@ -6867,7 +6867,7 @@ test_mf_fs_persist_multi(void)
FAIL_STACK_ERROR;
/* If H5FD_MEM_SUPER is there, should not find block #1 & #3 */
- if (H5F_addr_defined(f->shared->fs_addr[type])) {
+ if (H5_addr_defined(f->shared->fs_addr[type])) {
/* Start up H5FD_MEM_SUPER free-space manager */
if (H5MF__open_fstype(f, (H5F_mem_page_t)type) < 0)
FAIL_STACK_ERROR;
@@ -6886,7 +6886,7 @@ test_mf_fs_persist_multi(void)
}
/* Verify that the H5FD_MEM_GHEAP free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[gtype]))
+ if (!H5_addr_defined(f->shared->fs_addr[gtype]))
TEST_ERROR;
/* Start up H5FD_MEM_GHEAP free-space manager */
@@ -7021,7 +7021,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
H5MF__alloc_to_fs_type(f->shared, type, TBLOCK_SIZE6, (H5F_mem_page_t *)&tt);
/* Verify that H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[tt]))
+ if (!H5_addr_defined(f->shared->fs_addr[tt]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -7064,7 +7064,7 @@ test_mf_fs_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Verify that H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[tt]))
+ if (!H5_addr_defined(f->shared->fs_addr[tt]))
TEST_ERROR;
/* Retrieve block #5 from H5FD_MEM_SUPER free-space manager */
@@ -7199,7 +7199,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
H5MF__alloc_to_fs_type(f->shared, type, TBLOCK_SIZE4, (H5F_mem_page_t *)&fs_type);
/* Verify that the H5FD_MEM_SUPER free-space manager is not there */
- if (H5F_addr_defined(f->shared->fs_addr[fs_type]))
+ if (H5_addr_defined(f->shared->fs_addr[fs_type]))
TEST_ERROR;
/* Put block #3 to H5FD_MEM_SUPER free-space manager */
@@ -7218,7 +7218,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
FAIL_STACK_ERROR;
/* Verify that H5FD_MEM_SUPER free-space manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[fs_type]))
+ if (!H5_addr_defined(f->shared->fs_addr[fs_type]))
TEST_ERROR;
/* Start up H5FD_MEM_SUPER free-space manager */
@@ -7230,7 +7230,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
if (H5FS_stat_info(f, f->shared->fs_man[fs_type], &fs_stat) < 0)
FAIL_STACK_ERROR;
- if (!H5F_addr_defined(fs_stat.addr))
+ if (!H5_addr_defined(fs_stat.addr))
TEST_ERROR;
if (fs_stat.tot_space < TBLOCK_SIZE3)
@@ -7258,7 +7258,7 @@ test_mf_fs_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
if (NULL == (f = (H5F_t *)H5VL_object(file)))
FAIL_STACK_ERROR;
/* Verify that the H5FD_MEM_SUPER free-space manager is not there */
- if (H5F_addr_defined(f->shared->fs_addr[fs_type]))
+ if (H5_addr_defined(f->shared->fs_addr[fs_type]))
TEST_ERROR;
/* Closing */
@@ -7427,7 +7427,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for
}
}
else {
- if (H5F_addr_defined(f->shared->fs_addr[tt]))
+ if (H5_addr_defined(f->shared->fs_addr[tt]))
TEST_ERROR;
}
@@ -7617,7 +7617,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format
/* Free-space manager should be empty */
if (!(fs_type == H5F_FSPACE_STRATEGY_PAGE && fs_persist))
- if (H5F_addr_defined(f->shared->fs_addr[tt]))
+ if (H5_addr_defined(f->shared->fs_addr[tt]))
TEST_ERROR;
/* Closing */
@@ -7933,13 +7933,13 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl)
/* Verify that the large generic manager is there */
H5MF__alloc_to_fs_type(f->shared, H5FD_MEM_DRAW, TBLOCK_SIZE5000, (H5F_mem_page_t *)&fs_type);
- if (!H5F_addr_defined(f->shared->fs_addr[fs_type]))
+ if (!H5_addr_defined(f->shared->fs_addr[fs_type]))
TEST_ERROR;
/* Verify that the small metadata manager is there */
H5MF__alloc_to_fs_type(f->shared, H5FD_MEM_OHDR, f->shared->fs_page_size - 1,
(H5F_mem_page_t *)&fs_type);
- if (!H5F_addr_defined(f->shared->fs_addr[fs_type]))
+ if (!H5_addr_defined(f->shared->fs_addr[fs_type]))
TEST_ERROR;
/* Set up to use the small metadata manager */
@@ -7957,7 +7957,7 @@ test_page_alloc_xfree(const char *env_h5_drvr, hid_t fapl)
TEST_ERROR;
/* Verify that the small raw data manager is there */
- if (!H5F_addr_defined(f->shared->fs_addr[H5F_MEM_PAGE_DRAW]))
+ if (!H5_addr_defined(f->shared->fs_addr[H5F_MEM_PAGE_DRAW]))
TEST_ERROR;
/* Set up to use the small raw data manager */
@@ -8555,7 +8555,7 @@ test_page_large(const char *env_h5_drvr, hid_t fapl)
/* Allocate a large data block with gaddr3--should be on another page */
/* Allocate 2 pages + 3808 bytes; 288 bytes in free-space manager */
gaddr3 = H5MF_alloc(f, H5FD_MEM_DRAW, (hsize_t)TBLOCK_SIZE12000);
- if (!H5F_addr_defined(gaddr3))
+ if (!H5_addr_defined(gaddr3))
TEST_ERROR;
/* Free the block with gaddr2 */
generated by cgit v0.12 at 2024-07-08 20:03:53 (GMT)