diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-09-25 16:55:11 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-09-25 16:55:11 (GMT) |
| commit | faf723e6d546a280e3fe935626f0de18f1757377 (patch) | |
| tree | e33165e0428a7e4e9d35952ef9cecd9331b111ee /src/H5F.c | |
| parent | b5446a9c638b5a95b8dfe132f646aa4358d2b539 (diff) | |
| parent | 8880ec672eeb8f57c023938074d1336dfc82e2ed (diff) | |
| download | hdf5-faf723e6d546a280e3fe935626f0de18f1757377.zip hdf5-faf723e6d546a280e3fe935626f0de18f1757377.tar.gz hdf5-faf723e6d546a280e3fe935626f0de18f1757377.tar.bz2 | |
Merge pull request #684 in HDFFV/hdf5 from merge_full_swmr_01 to develop
* commit '8880ec672eeb8f57c023938074d1336dfc82e2ed':
Style cleanups and misc. bugfixes discovered during full SWMR development.
Diffstat (limited to 'src/H5F.c')
| -rw-r--r-- | src/H5F.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1633,7 +1633,7 @@ H5Fstart_swmr_write(hid_t file_id) if(file->shared->sblock->super_vers < HDF5_SUPERBLOCK_VERSION_3) HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "file superblock version should be at least 3") - HDassert(file->shared->latest_flags == H5F_LATEST_ALL_FLAGS); + HDassert((file->shared->latest_flags | H5F_LATEST_LAYOUT_MSG) > 0); /* Should not be marked for SWMR writing mode already */ if(file->shared->sblock->status_flags & H5F_SUPER_SWMR_WRITE_ACCESS) @@ -1647,6 +1647,10 @@ H5Fstart_swmr_write(hid_t file_id) if(ci_load || ci_write ) HGOTO_ERROR(H5E_FILE, H5E_UNSUPPORTED, FAIL, "can't have both SWMR and MDC cache image") + /* Flush the superblock extension */ + if(H5F_flush_tagged_metadata(file, file->shared->sblock->ext_addr, H5AC_ind_read_dxpl_id) < 0) + HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, NULL, "unable to flush superblock extension") + /* Flush data buffers */ if(H5F__flush(file, H5AC_ind_read_dxpl_id, H5AC_rawdata_dxpl_id, FALSE) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information") |