summaryrefslogtreecommitdiffstats
path: root/src/H5AC.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2021-03-24 20:57:32 (GMT)
committerGitHub <noreply@github.com>2021-03-24 20:57:32 (GMT)
commit3dbbd8aea1b8389ad7df0c982c9a78a9a2d4dee8 (patch)
treec395b2ba3cc7a3c3d8dd8b1acdb5ef239cfed69d /src/H5AC.c
parent1f637e49d98062562960dedff2a7c67423346c7d (diff)
downloadhdf5-3dbbd8aea1b8389ad7df0c982c9a78a9a2d4dee8.zip
hdf5-3dbbd8aea1b8389ad7df0c982c9a78a9a2d4dee8.tar.gz
hdf5-3dbbd8aea1b8389ad7df0c982c9a78a9a2d4dee8.tar.bz2
Align with "parallel fence" changes (#479)
* Small code updates and simplifications * Committing clang-format changes * Fix 'make installcheck' for parallel builds Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5AC.c')
-rw-r--r--src/H5AC.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index ffdca78..2eadd21 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -350,19 +350,14 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
if (NULL == (aux_ptr->candidate_slist_ptr = H5SL_create(H5SL_TYPE_HADDR, NULL)))
HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "can't create candidate entry list")
- if (aux_ptr != NULL)
- if (aux_ptr->mpi_rank == 0)
- f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE,
- (H5AC_NTYPES - 1), H5AC_class_s, H5AC__check_if_write_permitted,
- TRUE, H5AC__log_flushed_entry, (void *)aux_ptr);
- else
- f->shared->cache =
- H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
- H5AC_class_s, H5AC__check_if_write_permitted, TRUE, NULL, (void *)aux_ptr);
+ if (aux_ptr->mpi_rank == 0)
+ f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE,
+ (H5AC_NTYPES - 1), H5AC_class_s, H5AC__check_if_write_permitted,
+ TRUE, H5AC__log_flushed_entry, (void *)aux_ptr);
else
f->shared->cache =
H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE, H5AC__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1),
- H5AC_class_s, H5AC__check_if_write_permitted, TRUE, NULL, NULL);
+ H5AC_class_s, H5AC__check_if_write_permitted, TRUE, NULL, (void *)aux_ptr);
} /* end if */
else {
#endif /* H5_HAVE_PARALLEL */