diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-12-29 15:43:39 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-12-29 15:43:39 (GMT) |
| commit | 5e26cd2d824ea05e5ae5ca3aebaa439a9b80e7fc (patch) | |
| tree | 2ed2abb8653e179ae03d54d17b265b328e9bfcdd /src/H5C.c | |
| parent | 890e1f3263c450fe6ed4f65f7bbdb46f456a8098 (diff) | |
| parent | da2f1610d1f2cba40770aee6d0d6fbc8196645ae (diff) | |
| download | hdf5-5e26cd2d824ea05e5ae5ca3aebaa439a9b80e7fc.zip hdf5-5e26cd2d824ea05e5ae5ca3aebaa439a9b80e7fc.tar.gz hdf5-5e26cd2d824ea05e5ae5ca3aebaa439a9b80e7fc.tar.bz2 | |
Merge pull request #223 in HDFFV/hdf5 from develop_merge_cache_image_02 to develop
Merged normalizations w/ cache_image branch.
* commit 'da2f1610d1f2cba40770aee6d0d6fbc8196645ae':
More normalizations against incoming cache image branch.
Diffstat (limited to 'src/H5C.c')
| -rw-r--r-- | src/H5C.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -136,8 +136,7 @@ static herr_t H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr); static herr_t H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr); static herr_t H5C__flash_increase_cache_size(H5C_t * cache_ptr, - size_t old_entry_size, - size_t new_entry_size); + size_t old_entry_size, size_t new_entry_size); static herr_t H5C_flush_invalidate_cache(const H5F_t * f, hid_t dxpl_id, @@ -4391,7 +4390,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f, entry_ptr = cache_ptr->LRU_tail_ptr; while ( ( entry_ptr != NULL ) && - ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) && + ( (entry_ptr->type)->id != H5AC_EPOCH_MARKER_ID ) && ( bytes_evicted < eviction_size_limit ) ) { hbool_t corked = FALSE; @@ -4509,7 +4508,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f, entry_ptr = cache_ptr->LRU_tail_ptr; while ( ( entry_ptr != NULL ) && - ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) && + ( (entry_ptr->type)->id != H5AC_EPOCH_MARKER_ID ) && ( bytes_evicted < eviction_size_limit ) ) { HDassert( ! (entry_ptr->is_protected) ); @@ -5875,6 +5874,7 @@ H5C__flush_single_entry(const H5F_t *f, hid_t dxpl_id, H5C_cache_entry_t *entry_ HDassert(cache_ptr); HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); HDassert(entry_ptr); + HDassert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC); HDassert(entry_ptr->ring != H5C_RING_UNDEFINED); /* setup external flags from the flags parameter */ @@ -6776,7 +6776,7 @@ H5C_make_space_in_cache(H5F_t * f, ++num_corked_entries; didnt_flush_entry = TRUE; - } else if ( ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) && + } else if ( ( (entry_ptr->type)->id != H5AC_EPOCH_MARKER_ID ) && ( ! entry_ptr->flush_in_progress ) ) { didnt_flush_entry = FALSE; @@ -7433,7 +7433,6 @@ H5C_entry_in_skip_list(H5C_t * cache_ptr, H5C_cache_entry_t *target_ptr) return(in_slist); } /* H5C_entry_in_skip_list() */ - #endif /* H5C_DO_SLIST_SANITY_CHECKS */ |