diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-03-26 23:18:37 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-26 23:18:37 (GMT) |
commit | bddf4570347e695bae07a56a12e517af67baf0eb (patch) | |
tree | 4d4b5db05bca88459dc333cd3da57e0816419370 /test/fheap.c | |
parent | c81afbff45edb56b16d17d37c444485b587d51fd (diff) | |
parent | 0a73f3dd4b33abbd3ea9b024442e40ae05e56549 (diff) | |
download | hdf5-bddf4570347e695bae07a56a12e517af67baf0eb.zip hdf5-bddf4570347e695bae07a56a12e517af67baf0eb.tar.gz hdf5-bddf4570347e695bae07a56a12e517af67baf0eb.tar.bz2 |
Merge pull request #525 from derobins/vfd_swmr/thg_standards
Fixed 1.6 compatibility issues and ran source formatter
Diffstat (limited to 'test/fheap.c')
-rw-r--r-- | test/fheap.c | 75 |
1 files changed, 40 insertions, 35 deletions
diff --git a/test/fheap.c b/test/fheap.c index 2eb0372..2c888a2 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -80,8 +80,9 @@ #define IBLOCK_MAX_DROWS(fh, pos) \ H5HF_get_iblock_max_drows_test(fh, pos) /* Max. # of direct block rows in a indirect block */ #define DBLOCK_SIZE(fh, r) H5HF_get_dblock_size_test(fh, r) /* Size of a direct block in a given row */ -#define DBLOCK_FREE(fh, r) H5HF_get_dblock_free_test(fh, r) /* Free space in a direct block of a given row \ - */ +#define DBLOCK_FREE(fh, r) \ + H5HF_get_dblock_free_test(fh, r) /* Free space in a direct block of a given row \ + */ /* The number of settings for testing: page buffering, file space strategy and persisting free-space */ #define NUM_PB_FS 6 @@ -8467,10 +8468,10 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "skipping starting block, then adding object back to first block, then remove all objects %s"; /* Test - description - */ + const char *base_desc = "skipping starting block, then adding object back to first block, then remove " + "all objects %s"; /* Test + description + */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, NULL) < 0) @@ -8919,11 +8920,11 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t * size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "skipping blocks with indirect root, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u; /* Local index variable */ + const char *base_desc = "skipping blocks with indirect root, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u; /* Local index variable */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -9086,10 +9087,10 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling first row, then skipping rows, then backfill and extend, then remove all objects %s"; /* Test - description - */ + const char *base_desc = "filling first row, then skipping rows, then backfill and extend, then remove " + "all objects %s"; /* Test + description + */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -9600,12 +9601,13 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling direct blocks, filling 2nd level indirect blocks, except last one, and insert object too " - "large for 2nd level indirect blocks, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u; /* Local index variables */ + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, except last one, and " + "insert object too " + "large for 2nd level indirect blocks, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -10854,12 +10856,12 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char - *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd " - "level indirect blocks, except last one, fill all direct blocks in last 3rd level " - "indirect block, and insert object too large for it's 2nd level indirect blocks, then " - "backfill and extend, then remove all objects %s"; /* Test description */ - unsigned u, v; /* Local index variables */ + const char * base_desc = + "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd " + "level indirect blocks, except last one, fill all direct blocks in last 3rd level " + "indirect block, and insert object too large for it's 2nd level indirect blocks, then " + "backfill and extend, then remove all objects %s"; /* Test description */ + unsigned u, v; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -11764,14 +11766,17 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill " - "first row of 3rd level indirect blocks in 4th level indirect block except last 3rd level block, " - "fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect " - "block's 3rd level indirect block, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u, v; /* Local index variables */ + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level " + "indirect blocks, fill " + "first row of 3rd level indirect blocks in 4th level indirect block except last " + "3rd level block, " + "fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of " + "4th level indirect " + "block's 3rd level indirect block, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u, v; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) |