diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2018-03-20 22:30:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2018-03-20 22:30:33 (GMT) |
| commit | c5db36c7df19f27d65b29364596e81f7d5c8434d (patch) | |
| tree | bb1c027f03902961b0d0fe7fe564b46c72072700 /src | |
| parent | c135db33656a94bdebb8b8c52275356208e4f3dd (diff) | |
| download | hdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.zip hdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.tar.gz hdf5-c5db36c7df19f27d65b29364596e81f7d5c8434d.tar.bz2 | |
Update handling of reporting for breaking collective I/O when the default
DXPL is used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5CX.c | 24 |
1 files changed, 14 insertions, 10 deletions
@@ -2436,12 +2436,14 @@ H5CX_set_mpio_local_no_coll_cause(uint32_t mpio_local_no_coll_cause) /* Sanity checks */ HDassert(head && *head); - HDassert(!((*head)->ctx.dxpl_id == H5P_DEFAULT || - (*head)->ctx.dxpl_id == H5P_DATASET_XFER_DEFAULT)); + HDassert((*head)->ctx.dxpl_id != H5P_DEFAULT); - /* Cache the value for later, marking it to set in DXPL when context popped */ - (*head)->ctx.mpio_local_no_coll_cause = mpio_local_no_coll_cause; - (*head)->ctx.mpio_local_no_coll_cause_set = TRUE; + /* If we're using the default DXPL, don't modify it */ + if((*head)->ctx.dxpl_id != H5P_DATASET_XFER_DEFAULT) { + /* Cache the value for later, marking it to set in DXPL when context popped */ + (*head)->ctx.mpio_local_no_coll_cause = mpio_local_no_coll_cause; + (*head)->ctx.mpio_local_no_coll_cause_set = TRUE; + } /* end if */ FUNC_LEAVE_NOAPI_VOID } /* end H5CX_set_mpio_local_no_coll_cause() */ @@ -2468,12 +2470,14 @@ H5CX_set_mpio_global_no_coll_cause(uint32_t mpio_global_no_coll_cause) /* Sanity checks */ HDassert(head && *head); - HDassert(!((*head)->ctx.dxpl_id == H5P_DEFAULT || - (*head)->ctx.dxpl_id == H5P_DATASET_XFER_DEFAULT)); + HDassert((*head)->ctx.dxpl_id != H5P_DEFAULT); - /* Cache the value for later, marking it to set in DXPL when context popped */ - (*head)->ctx.mpio_global_no_coll_cause = mpio_global_no_coll_cause; - (*head)->ctx.mpio_global_no_coll_cause_set = TRUE; + /* If we're using the default DXPL, don't modify it */ + if((*head)->ctx.dxpl_id != H5P_DATASET_XFER_DEFAULT) { + /* Cache the value for later, marking it to set in DXPL when context popped */ + (*head)->ctx.mpio_global_no_coll_cause = mpio_global_no_coll_cause; + (*head)->ctx.mpio_global_no_coll_cause_set = TRUE; + } /* end if */ FUNC_LEAVE_NOAPI_VOID } /* end H5CX_set_mpio_global_no_coll_cause() */ |