diff options
author | David Young <dyoung@hdfgroup.org> | 2020-02-04 19:14:23 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-02-06 20:14:34 (GMT) |
commit | 70515b290f883c0915543fef44a0f0c2c94073f8 (patch) | |
tree | 9cbd787c0faa294ba1bdc5d0f00713947c9ddc22 /src/H5Ftest.c | |
parent | 3c4a34951e6591bf7acd09b16dc0b3e310a2e8ab (diff) | |
download | hdf5-70515b290f883c0915543fef44a0f0c2c94073f8.zip hdf5-70515b290f883c0915543fef44a0f0c2c94073f8.tar.gz hdf5-70515b290f883c0915543fef44a0f0c2c94073f8.tar.bz2 |
Rename the deferred-free queues. There are two of them, and the names I used
for them did not help me keep track of what they were for.
For brevity, I will call a deferred free record a "defree" in the code.
The deferred_free_queue_t becomes a lower_defree_queue_t, and each record on
the queue becomes a lower_defree_t. A lower_defree_t tracks one deferred free
on the lower VFD---that is, the one under the SWMR VFD.
The old_image_queue_t becomes a shadow_defree_queue_t, and a record therein is
a shadow_defree_t. A shadow_defree_t tracks one deferred free on the shadow
file.
Diffstat (limited to 'src/H5Ftest.c')
-rw-r--r-- | src/H5Ftest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Ftest.c b/src/H5Ftest.c index e1569a7..ced4b2c 100644 --- a/src/H5Ftest.c +++ b/src/H5Ftest.c @@ -531,12 +531,12 @@ done: } /* H5F__vfd_swmr_verify_md_hdr_and_idx() */ static unsigned -count_old_images(old_image_queue_t *old_images) +count_shadow_defrees(shadow_defree_queue_t *shadow_defrees) { - old_image_t *old_image; + shadow_defree_t *shadow_defree; unsigned count = 0; - TAILQ_FOREACH(old_image, old_images, link) + TAILQ_FOREACH(shadow_defree, shadow_defrees, link) count++; return count; @@ -551,7 +551,7 @@ count_old_images(old_image_queue_t *old_images) * --info read from the metadata file is as indicated by * the input: num_entries, index * --# of entries on the delayed list is as indicated by - * the input: nold_images + * the input: nshadow_defrees * * Return: SUCCEED/FAIL * @@ -559,7 +559,7 @@ count_old_images(old_image_queue_t *old_images) */ herr_t H5F__vfd_swmr_writer_md_test(hid_t file_id, unsigned num_entries, - H5FD_vfd_swmr_idx_entry_t *index, unsigned nold_images) + H5FD_vfd_swmr_idx_entry_t *index, unsigned nshadow_defrees) { H5F_t *f; /* File pointer */ int md_fd = -1; /* The metadata file descriptor */ @@ -581,7 +581,7 @@ H5F__vfd_swmr_writer_md_test(hid_t file_id, unsigned num_entries, HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, FAIL, "error updating the md file with the index") /* Verify the number of entries in the delayed list is as expected */ - if(count_old_images(&f->shared->old_images) < nold_images) + if(count_shadow_defrees(&f->shared->shadow_defrees) < nshadow_defrees) HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect # of entries in the delayed list") /* Open the metadata file */ |