mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove some usage of "prefetched_dirty" flag (which hasn't been merged from the

Browse Source 
page_buffering branch yet.  Also, bring over improvements to flush candidate
entries for parallel code.
This commit is contained in:
Quincey Koziol 2017-03-09 21:38:26 -08:00
parent d0226dffb2
commit 36f06cab79
3 changed files with 578 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/H5C.c
View File

@ -1459,7 +1459,6 @@ H5C_insert_entry(H5F_t * f,
entry_ptr->prefetched = FALSE; entry_ptr->prefetched = FALSE;
entry_ptr->prefetch_type_id = 0; entry_ptr->prefetch_type_id = 0;
entry_ptr->age = 0; entry_ptr->age = 0;
entry_ptr->prefetched_dirty = FALSE;
#ifndef NDEBUG /* debugging field */ #ifndef NDEBUG /* debugging field */
entry_ptr->serialization_count = 0; entry_ptr->serialization_count = 0;
#endif /* NDEBUG */ #endif /* NDEBUG */

2
src/H5Cimage.c
View File

@ -636,7 +636,6 @@ H5C__deserialize_prefetched_entry(H5F_t *f, hid_t dxpl_id, H5C_t *cache_ptr,
ds_entry_ptr->prefetched = FALSE; ds_entry_ptr->prefetched = FALSE;
ds_entry_ptr->prefetch_type_id = 0; ds_entry_ptr->prefetch_type_id = 0;
ds_entry_ptr->age = 0; ds_entry_ptr->age = 0;
ds_entry_ptr->prefetched_dirty = pf_entry_ptr->prefetched_dirty;
#ifndef NDEBUG /* debugging field */ #ifndef NDEBUG /* debugging field */
ds_entry_ptr->serialization_count = 0; ds_entry_ptr->serialization_count = 0;
#endif /* NDEBUG */ #endif /* NDEBUG */
@ -3318,7 +3317,6 @@ H5C__reconstruct_cache_entry(const H5F_t *f, H5C_t *cache_ptr,
pf_entry_ptr->image_up_to_date = TRUE; pf_entry_ptr->image_up_to_date = TRUE;
pf_entry_ptr->type = H5AC_PREFETCHED_ENTRY; pf_entry_ptr->type = H5AC_PREFETCHED_ENTRY;
pf_entry_ptr->prefetched = TRUE; pf_entry_ptr->prefetched = TRUE;
pf_entry_ptr->prefetched_dirty = is_dirty && (!file_is_rw);
/* Sanity checks */ /* Sanity checks */
HDassert(pf_entry_ptr->size > 0 && pf_entry_ptr->size < H5C_MAX_ENTRY_SIZE); HDassert(pf_entry_ptr->size > 0 && pf_entry_ptr->size < H5C_MAX_ENTRY_SIZE);

992
src/H5Cmpio.c
View File

File diff suppressed because it is too large Load Diff