diff options
author | Quincey Koziol <koziol@lbl.gov> | 2017-10-02 16:35:59 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@lbl.gov> | 2017-10-02 16:35:59 (GMT) |
commit | 9d6ba29a01079e0f81ffa530605d8cd830378f9c (patch) | |
tree | 3db9959e2002c6121c002a130dbf3965b9026a82 /test | |
parent | b7e563266e8484c96d5ac75b9dcec2337bb15d43 (diff) | |
parent | 744b6b282f087ce23310805dc24ce8f8b351fb61 (diff) | |
download | hdf5-9d6ba29a01079e0f81ffa530605d8cd830378f9c.zip hdf5-9d6ba29a01079e0f81ffa530605d8cd830378f9c.tar.gz hdf5-9d6ba29a01079e0f81ffa530605d8cd830378f9c.tar.bz2 |
Merge pull request #687 in HDFFV/hdf5 from merge_full_swmr_02 to develop
* commit '744b6b282f087ce23310805dc24ce8f8b351fb61':
Better segregate clean & dirty LRU lists so that they are only defined when the H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS macro is defined.
Diffstat (limited to 'test')
-rw-r--r-- | test/cache.c | 9 | ||||
-rw-r--r-- | test/cache_common.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/cache.c b/test/cache.c index 3df8156..97a1b91 100644 --- a/test/cache.c +++ b/test/cache.c @@ -3116,13 +3116,14 @@ check_insert_entry(unsigned paged) (cache_ptr->pel_len != 2) || (cache_ptr->pel_size != 2 * entry_sizes[entry_type]) || (cache_ptr->LRU_list_len != 2) || - (cache_ptr->LRU_list_size != 2 * entry_sizes[entry_type]) || + (cache_ptr->LRU_list_size != 2 * entry_sizes[entry_type]) #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS - (cache_ptr->dLRU_list_len != 2) || + || (cache_ptr->dLRU_list_len != 2) || (cache_ptr->dLRU_list_size != 2 * entry_sizes[entry_type]) || -#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ (cache_ptr->cLRU_list_len != 0) || - (cache_ptr->cLRU_list_size != (size_t)0)) { + (cache_ptr->cLRU_list_size != (size_t)0) +#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ + ) { pass = FALSE; failure_mssg = "Unexpected insert results 10."; diff --git a/test/cache_common.c b/test/cache_common.c index 69bc26a..cadccec 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -2436,8 +2436,10 @@ reset_entries(void) base_addr[j].header.ro_ref_count = FALSE; base_addr[j].header.next = NULL; base_addr[j].header.prev = NULL; +#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS base_addr[j].header.aux_next = NULL; base_addr[j].header.aux_prev = NULL; +#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ base_addr[j].self = &(base_addr[j]); base_addr[j].cache_ptr = NULL; |