philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/vfd_swmr' into may-merge-mainzer-to-mine

Browse Source
This commit is contained in:
David Young
2020-05-26 13:14:20 -05:00
parent eeda47bcf6 d46b2c5afb
commit e917d66df6
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/gnu-flags
View File

@@ -20,7 +20,7 @@
#
# For now, do not promote any warnings to errors.
#
PROMOTE_ERRORS_DFLT=no
PROMOTE_ERRORS_DFLT=yes
#
# This filter rewrites -Werror= as -W, in that way demoting warnings

2
src/H5C.c
View File

@@ -7473,7 +7473,7 @@ H5C_load_entry(H5F_t * f,
H5FD_vfd_swmr_dump_status(f->shared->lf, page);
#endif /* JRM */
HGOTO_ERROR(H5E_CACHE, H5E_READERROR, NULL, \
"incorrect metadatda checksum after all read attempts")
"incorrect metadata checksum after all read attempts addr %" PRIuHADDR " size %zu", addr, len);
}
/* Calculate and track the # of retries */

9
src/H5Fvfd_swmr.c
View File

@@ -1309,6 +1309,15 @@ H5F_vfd_swmr_reader_end_of_tick(H5F_t *f, bool entering_api)
entries_added += new_mdf_idx_entries_used - j;
for (; j < new_mdf_idx_entries_used; j++) {
hlog_fast(shadow_index_update,
"writer added shadow index slot %" PRIu32
" for page %" PRIu64, j, new_mdf_idx[j].hdf5_page_offset);
change[nchanges].pgno = new_mdf_idx[j].hdf5_page_offset;
change[nchanges].length = new_mdf_idx[j].length;
nchanges++;
}
/* cleanup any left overs in the old index */
for (; i < old_mdf_idx_entries_used; i++) {

10
src/H5PBpkg.h
View File

@@ -670,19 +670,19 @@ if ( ( (entry_ptr) == NULL ) || \
#define H5PB__UPDATE_STATS_FOR_ACCESS(pb_ptr, type, size) \
{ \
int ii; \
int _i; \
\
HDassert(pb_ptr); \
HDassert((pb_ptr)->magic == H5PB__H5PB_T_MAGIC); \
\
if ( H5FD_MEM_DRAW == (type) ) { \
ii = H5PB__STATS_RD; \
_i = H5PB__STATS_RD; \
} else if ( (size) > (pb_ptr)->page_size ) { \
ii = H5PB__STATS_MPMDE; \
_i = H5PB__STATS_MPMDE; \
} else { \
ii = H5PB__STATS_MD; \
_i = H5PB__STATS_MD; \
} \
((pb_ptr)->accesses[ii])++; \
((pb_ptr)->accesses[_i])++; \
} /* H5PB__UPDATE_STATS_FOR_ACCESS */