diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-07-17 00:44:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 00:44:37 (GMT) |
| commit | a9e8b12a0a7aaf7fe0ffe0a103db2d8d4471c58b (patch) | |
| tree | e0f63d0b9cc36053232bdd37e36f5bc7e9d65960 /src/H5Fint.c | |
| parent | 4e52705dedff3ea57296f40dd0d0fda62528e911 (diff) | |
| download | hdf5-a9e8b12a0a7aaf7fe0ffe0a103db2d8d4471c58b.zip hdf5-a9e8b12a0a7aaf7fe0ffe0a103db2d8d4471c58b.tar.gz hdf5-a9e8b12a0a7aaf7fe0ffe0a103db2d8d4471c58b.tar.bz2 | |
VFD SWMR: Removes dedup callback + cleanup (#842)
* HDF5-ification of dedup calls
* Removes dedup callback from VFD struct
* VFD SWMR library code cleanup
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 44506b6..247a047 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -1575,12 +1575,6 @@ H5F__dest(H5F_t *f, hbool_t flush) /* Push error, but keep going*/ HDONE_ERROR(H5E_IO, H5E_CANTFLUSH, FAIL, "vfd swmr prep for flush or close failed") - if ((f->shared->vfd_swmr) && (!f->shared->vfd_swmr_writer)) - HDfprintf(stdout, - "The maximum jump in ticks is %" PRIu64 - "; The maximum expected lag configured is %" PRIu32 "\n", - f->shared->max_jump_ticks, f->shared->vfd_swmr_config.max_lag); - /* Shutdown the page buffer cache */ if (H5PB_dest(f->shared) < 0) /* Push error, but keep going*/ @@ -1932,9 +1926,8 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) /* Avoid reusing a virtual file opened exclusively by a second virtual * file, or opening the same file twice with different parameters. */ - if ((lf = H5FD_deduplicate(lf, fapl_id)) == NULL) { - HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "an already-open file conflicts with '%s'", name); - } + if ((lf = H5FD_deduplicate(lf, fapl_id)) == NULL) + HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "an already-open file conflicts with '%s'", name) /* Is the file already open? */ if ((shared = H5F__sfile_search(lf)) != NULL) { |