Skip to content

Commit

Permalink
Committing clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Oct 3, 2023
1 parent 811da1d commit 3d94866
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/H5Dchunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,8 @@ H5D__chunk_io_init(H5D_io_info_t *io_info, H5D_dset_io_info_t *dinfo)
* independent metadata reads later on.
*/
if (H5F_SHARED_HAS_FEATURE(io_info->f_sh, H5FD_FEAT_HAS_MPI) &&
H5F_shared_get_coll_metadata_reads(io_info->f_sh) &&
H5D__chunk_is_space_alloc(&dataset->shared->layout.storage)) {
H5F_shared_get_coll_metadata_reads(io_info->f_sh) &&
H5D__chunk_is_space_alloc(&dataset->shared->layout.storage)) {
H5D_chunk_ud_t udata;
hsize_t scaled[H5O_LAYOUT_NDIMS] = {0};

Expand Down
19 changes: 10 additions & 9 deletions src/H5Dmpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1360,8 +1360,8 @@ H5D__piece_io(H5D_io_info_t *io_info)
default: /* multiple chunk IO via threshold */
/* Check if there are any filters in the pipeline */
if (io_info->dsets_info[i].dset->shared->dcpl_cache.pline.nused > 0) {
if (H5D__multi_chunk_filtered_collective_io(io_info, &io_info->dsets_info[i],
1, mpi_rank, mpi_size) < 0)
if (H5D__multi_chunk_filtered_collective_io(io_info, &io_info->dsets_info[i], 1,
mpi_rank, mpi_size) < 0)
HGOTO_ERROR(
H5E_IO,
(H5D_IO_OP_READ == io_info->op_type ? H5E_READERROR : H5E_WRITEERROR),
Expand Down Expand Up @@ -3240,9 +3240,10 @@ H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, const
curr_dset_info->index_empty = false;

/* Determine if fill values should be written to chunks */
fill_msg = &di[dset_idx].dset->shared->dcpl_cache.fill;
curr_dset_info->should_fill = (fill_msg->fill_time == H5D_FILL_TIME_ALLOC) ||
((fill_msg->fill_time == H5D_FILL_TIME_IFSET) && fill_msg->fill_defined);
fill_msg = &di[dset_idx].dset->shared->dcpl_cache.fill;
curr_dset_info->should_fill =
(fill_msg->fill_time == H5D_FILL_TIME_ALLOC) ||
((fill_msg->fill_time == H5D_FILL_TIME_IFSET) && fill_msg->fill_defined);

if (curr_dset_info->should_fill) {
hsize_t chunk_dims[H5S_MAX_RANK];
Expand Down Expand Up @@ -3292,8 +3293,8 @@ H5D__mpio_collective_filtered_chunk_io_setup(const H5D_io_info_t *io_info, const
* worked on.
*/
if (num_dset_infos > 1) {
HASH_ADD(hh, chunk_list->dset_info.dset_info_hash_table, dset_oloc_addr,
sizeof(haddr_t), curr_dset_info);
HASH_ADD(hh, chunk_list->dset_info.dset_info_hash_table, dset_oloc_addr, sizeof(haddr_t),
curr_dset_info);
}
else
chunk_list->dset_info.single_dset_info = curr_dset_info;
Expand Down Expand Up @@ -5419,8 +5420,8 @@ H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t *
/* Set metadata tagging with dataset oheader addr */
H5AC_tag(cached_dset_info->dset_io_info->dset->oloc.addr, &prev_tag);

if ((cached_dset_info->chunk_idx_info.storage->ops->insert)(&cached_dset_info->chunk_idx_info,
&chunk_ud, cached_dset_info->dset_io_info->dset) < 0)
if ((cached_dset_info->chunk_idx_info.storage->ops->insert)(
&cached_dset_info->chunk_idx_info, &chunk_ud, cached_dset_info->dset_io_info->dset) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "unable to insert chunk address into index");

/* Reset metadata tagging */
Expand Down
4 changes: 2 additions & 2 deletions src/H5Fprivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ typedef struct H5F_t H5F_t;
#define H5F_USE_TMP_SPACE(F) ((F)->shared->fs.use_tmp_space)
#define H5F_IS_TMP_ADDR(F, ADDR) (H5_addr_le((F)->shared->fs.tmp_addr, (ADDR)))
#ifdef H5_HAVE_PARALLEL
#define H5F_COLL_MD_READ(F) ((F)->shared->coll_md_read)
#define H5F_COLL_MD_READ(F) ((F)->shared->coll_md_read)
#define H5F_SHARED_COLL_MD_READ(F_SH) ((F_SH)->coll_md_read)
#endif /* H5_HAVE_PARALLEL */
#define H5F_USE_MDC_LOGGING(F) ((F)->shared->use_mdc_logging)
Expand Down Expand Up @@ -149,7 +149,7 @@ typedef struct H5F_t H5F_t;
#define H5F_USE_TMP_SPACE(F) (H5F_use_tmp_space(F))
#define H5F_IS_TMP_ADDR(F, ADDR) (H5F_is_tmp_addr((F), (ADDR)))
#ifdef H5_HAVE_PARALLEL
#define H5F_COLL_MD_READ(F) (H5F_coll_md_read(F))
#define H5F_COLL_MD_READ(F) (H5F_coll_md_read(F))
#define H5F_SHARED_COLL_MD_READ(F_SH) (H5F_shared_coll_md_read(F))
#endif /* H5_HAVE_PARALLEL */
#define H5F_USE_MDC_LOGGING(F) (H5F_use_mdc_logging(F))
Expand Down

0 comments on commit 3d94866

Please sign in to comment.