diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-03-13 19:04:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-03-13 19:04:33 (GMT) |
| commit | 847d675f2743ec420ef6c9efdd6e52ae93b4fe44 (patch) | |
| tree | 3e74669322711c4ea14f8fd80ecf14da984c6212 /src/H5Ctag.c | |
| parent | 56e5b4ed05fb3bad51c226ec5b567871a45e0bce (diff) | |
| parent | 4fad103187db9095afc8eab90b5f5544feb1d19b (diff) | |
| download | hdf5-847d675f2743ec420ef6c9efdd6e52ae93b4fe44.zip hdf5-847d675f2743ec420ef6c9efdd6e52ae93b4fe44.tar.gz hdf5-847d675f2743ec420ef6c9efdd6e52ae93b4fe44.tar.bz2 | |
Merge pull request #333 in HDFFV/hdf5 from merge_page_buffering_07 to develop
* commit '4fad103187db9095afc8eab90b5f5544feb1d19b':
Bring changes to I/O parameters from page_buffering branch.
Merge in reentrency changes to "make space in cache" from page_buffering branch.
Minor cleanups and bring over "prefetched dirty" fixes for entries loaded from a cache image.
Remove some usage of "prefetched_dirty" flag (which hasn't been merged from the page_buffering branch yet. Also, bring over improvements to flush candidate entries for parallel code.
Align with incoming page buffering changes: minor cleanups, centralize removing entries from collective metadata read list
Diffstat (limited to 'src/H5Ctag.c')
| -rw-r--r-- | src/H5Ctag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Ctag.c b/src/H5Ctag.c index 157a838..a9bcca1 100644 --- a/src/H5Ctag.c +++ b/src/H5Ctag.c @@ -465,7 +465,7 @@ H5C__evict_tagged_entries_cb(H5C_cache_entry_t *entry, void *_ctx) entry and we'll loop back around again (as evicting other entries will hopefully unpin this entry) */ ctx->pinned_entries_need_evicted = TRUE; - else { + else if(!entry->prefetched_dirty) { /* Evict the Entry */ if(H5C__flush_single_entry(ctx->f, ctx->dxpl_id, entry, H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG | H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, H5_ITER_ERROR, "Entry eviction failed.") |