diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-08-25 13:37:28 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-08-25 13:37:28 (GMT) |
| commit | e8dc2c232da25eb914ea41303bd15fe81e45564f (patch) | |
| tree | f2cfe35d97f4643dd7bb12195d9efd7df8d10c35 /src | |
| parent | 071fb9393ee810269befd821e40f65fc590a9d90 (diff) | |
| download | hdf5-e8dc2c232da25eb914ea41303bd15fe81e45564f.zip hdf5-e8dc2c232da25eb914ea41303bd15fe81e45564f.tar.gz hdf5-e8dc2c232da25eb914ea41303bd15fe81e45564f.tar.bz2 | |
[svn-r27573] fix serial build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5C.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -7756,7 +7756,9 @@ H5C__flush_single_entry(const H5F_t *f, hid_t dxpl_id, H5C_cache_entry_t *entry_ else destroy_entry = destroy; +#ifdef H5_HAVE_PARALLEL HDassert(FALSE == entry_ptr->coll_access); +#endif /* we will write the entry to disk if it exists, is dirty, and if the * clear only flag is not set. @@ -9023,10 +9025,12 @@ H5C_make_space_in_cache(H5F_t * f, cache_ptr->entries_removed_counter = 0; cache_ptr->last_entry_removed_ptr = NULL; +#ifdef H5_HAVE_PARALLEL if(TRUE == entry_ptr->coll_access) { entry_ptr->coll_access = FALSE; H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL) } +#endif if(H5C__flush_single_entry(f, dxpl_id, entry_ptr, H5C__NO_FLAGS_SET, NULL, NULL) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry") @@ -9045,10 +9049,12 @@ H5C_make_space_in_cache(H5F_t * f, cache_ptr->entries_scanned_to_make_space++; #endif /* H5C_COLLECT_CACHE_STATS */ +#ifdef H5_HAVE_PARALLEL if(TRUE == entry_ptr->coll_access) { entry_ptr->coll_access = FALSE; H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL) } +#endif if(H5C__flush_single_entry(f, dxpl_id, entry_ptr, H5C__FLUSH_INVALIDATE_FLAG | H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG, NULL, NULL) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush entry") |