diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-09-26 21:57:22 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-09-26 21:57:22 (GMT) |
| commit | 1b63ff60d245b08b4ace7d8947551248b5e89713 (patch) | |
| tree | e58ee7a694da5f212ed652ed4fb7de6f3f16ec27 /src/H5Fint.c | |
| parent | 2fd118ceaf50d2f4f0774c48d4db656ebb79d1b0 (diff) | |
| download | hdf5-1b63ff60d245b08b4ace7d8947551248b5e89713.zip hdf5-1b63ff60d245b08b4ace7d8947551248b5e89713.tar.gz hdf5-1b63ff60d245b08b4ace7d8947551248b5e89713.tar.bz2 | |
Rename local variable `delay_write_until` as `until`. Reduce
parenthesization in an `if` condition. Join some lines. No functional
change intended.
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 95a7cd8..f26a79c 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -4436,7 +4436,7 @@ H5F_vfd_swmr_writer__delay_write(H5F_t *f, uint64_t page, uint32_t top = 0; uint32_t bottom = 1; uint32_t probe; - uint64_t delay_write_until = 0; + uint64_t until = 0; H5FD_vfd_swmr_idx_entry_t * ie_ptr = NULL; H5FD_vfd_swmr_idx_entry_t * idx = NULL; herr_t ret_value = SUCCEED; /* Return value */ @@ -4489,25 +4489,21 @@ H5F_vfd_swmr_writer__delay_write(H5F_t *f, uint64_t page, if ( ie_ptr->delayed_flush >= f->shared->tick_num ) { - delay_write_until = ie_ptr->delayed_flush; + until = ie_ptr->delayed_flush; } } else { - delay_write_until = f->shared->tick_num + + until = f->shared->tick_num + f->shared->vfd_swmr_config.max_lag; } - if ( ( delay_write_until != 0 ) && - ( ! ( ( delay_write_until >= f->shared->tick_num ) && - ( delay_write_until <= - (f->shared->tick_num + f->shared->vfd_swmr_config.max_lag) ) - ) - ) - ) + if (until != 0 && + (until < f->shared->tick_num || + until > (f->shared->tick_num + f->shared->vfd_swmr_config.max_lag))) HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \ "VFD SWMR write delay out of range") - *delay_write_until_ptr = delay_write_until; + *delay_write_until_ptr = until; done: |