diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2012-09-14 20:24:02 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2012-09-14 20:24:02 (GMT) |
| commit | 0a5b0304ad85cfd1dba3357266ba036938450dd3 (patch) | |
| tree | 8a8870c5ed7c23efc91ec5c171ad5d75cb2d5e97 /src | |
| parent | 602c716f76f3d4623ac24419dd8419a2a1817aaa (diff) | |
| download | hdf5-0a5b0304ad85cfd1dba3357266ba036938450dd3.zip hdf5-0a5b0304ad85cfd1dba3357266ba036938450dd3.tar.gz hdf5-0a5b0304ad85cfd1dba3357266ba036938450dd3.tar.bz2 | |
[svn-r22763] Purpose:
HDFFV-8143 Provide a routine(s) for telling the user why the library broke collective data access
Description:
Fixed Daily test failed from the previous commit r22735. (ember)
Also changed H5Pget_mpio_no_collective_cause() parameter type from
H5D_mpio_no_collective_cause_t to uint32_t due to change to return
combined bitmap value which can be not emun defined value.
Tested:
jam (linux32-LE), koala-pp (linux64-LE), ember, h5committest
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Pdxpl.c | 8 | ||||
| -rw-r--r-- | src/H5Ppublic.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 2596d35..71daa73 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -103,7 +103,7 @@ #define H5D_MPIO_ACTUAL_IO_MODE_SIZE sizeof(H5D_mpio_actual_io_mode_t) #define H5D_MPIO_ACTUAL_IO_MODE_DEF H5D_MPIO_NO_COLLECTIVE /* Definitions for cause of broken collective io property */ -#define H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE sizeof(H5D_mpio_no_collective_cause_t) +#define H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE sizeof(uint32_t) #define H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF H5D_MPIO_COLLECTIVE /* Definitions for memory MPI type property */ #define H5FD_MPI_XFER_MEM_MPI_TYPE_SIZE sizeof(MPI_Datatype) @@ -292,11 +292,11 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the local cause of broken collective I/O */ - if(H5P_register_real(pclass, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_actual_io_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + if(H5P_register_real(pclass, H5D_MPIO_LOCAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the global cause of broken collective I/O */ - if(H5P_register_real(pclass, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_actual_io_mode, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) + if(H5P_register_real(pclass, H5D_MPIO_GLOBAL_NO_COLLECTIVE_CAUSE_NAME, H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE, &def_mpio_no_collective_cause, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") /* Register the MPI memory type property */ @@ -1385,7 +1385,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_mpio_no_collective_cause(hid_t plist_id, H5D_mpio_no_collective_cause_t *local_no_collective_cause, H5D_mpio_no_collective_cause_t *global_no_collective_cause) +H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause, uint32_t *global_no_collective_cause) { H5P_genplist_t *plist; herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index fd75e86..da8c034 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -412,7 +412,7 @@ H5_DLL herr_t H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, voi #ifdef H5_HAVE_PARALLEL H5_DLL herr_t H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode_t *actual_chunk_opt_mode); H5_DLL herr_t H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_mode); -H5_DLL herr_t H5Pget_mpio_no_collective_cause(hid_t plist_id, H5D_mpio_no_collective_cause_t *local_no_collective_cause, H5D_mpio_no_collective_cause_t *global_no_collective_cause); +H5_DLL herr_t H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_cause, uint32_t *global_no_collective_cause); #endif /* H5_HAVE_PARALLEL */ /* Link creation property list (LCPL) routines */ |