summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-10-12 19:16:32 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-10-12 19:16:32 (GMT)
commit5f8a03a2bf32889843ce71e930e68dfb0bf04f65 (patch)
tree03e51bb446487c4e7845e24a8e32f7111edc4bd4 /src
parentd1fb88d51ca4076844a85ae8ca56b22c9530e678 (diff)
downloadhdf5-5f8a03a2bf32889843ce71e930e68dfb0bf04f65.zip
hdf5-5f8a03a2bf32889843ce71e930e68dfb0bf04f65.tar.gz
hdf5-5f8a03a2bf32889843ce71e930e68dfb0bf04f65.tar.bz2
[svn-r21529] Description:
Update tracing information with new types introduced in "actual I/O mode" query routines. Tested on: bin/reconfigure on jam
Diffstat (limited to 'src')
-rw-r--r--src/H5Pdxpl.c6
-rw-r--r--src/H5trace.c72
2 files changed, 75 insertions, 3 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 66c1fde..9c6733b 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -1434,7 +1434,7 @@ H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_API(H5Pget_mpio_actual_chunk_opt_mode, FAIL)
- H5TRACE2("e","ix", plist_id, actual_chunk_opt_mode);
+ H5TRACE2("e", "i*Do", plist_id, actual_chunk_opt_mode);
/* Get the plist structure */
if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
@@ -1463,13 +1463,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t * actual_io_mode)
+H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_mode)
{
H5P_genplist_t *plist;
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_API(H5Pget_mpio_actual_io_mode, FAIL)
- H5TRACE2("e","ix", plist_id, actual_io_mode);
+ H5TRACE2("e", "i*Di", plist_id, actual_io_mode);
/* Get the plist structure */
if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_XFER)))
diff --git a/src/H5trace.c b/src/H5trace.c
index 4637b91..b711f40 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -458,6 +458,44 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
} /* end else */
break;
+ case 'i':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5D_mpio_actual_io_mode_t actual_io_mode = (H5D_mpio_actual_io_mode_t)va_arg(ap, int);
+
+ switch(actual_io_mode) {
+ case H5D_MPIO_NO_COLLECTIVE:
+ fprintf(out, "H5D_MPIO_NO_COLLECTIVE");
+ break;
+
+ case H5D_MPIO_CHUNK_INDEPENDENT:
+ fprintf(out, "H5D_MPIO_CHUNK_INDEPENDENT");
+ break;
+
+ case H5D_MPIO_CHUNK_COLLECTIVE:
+ fprintf(out, "H5D_MPIO_CHUNK_COLLECTIVE");
+ break;
+
+ case H5D_MPIO_CHUNK_MIXED:
+ fprintf(out, "H5D_MPIO_CHUNK_MIXED");
+ break;
+
+ case H5D_MPIO_CONTIGUOUS_COLLECTIVE:
+ fprintf(out, "H5D_MPIO_CONTIGUOUS_COLLECTIVE");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)actual_io_mode);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
case 'l':
if(ptr) {
if(vp)
@@ -496,6 +534,40 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
} /* end else */
break;
+ case 'o':
+ if(ptr) {
+ if(vp)
+ fprintf(out, "0x%lx", (unsigned long)vp);
+ else
+ fprintf(out, "NULL");
+ } /* end if */
+ else {
+ H5D_mpio_actual_chunk_opt_mode_t chunk_opt_mode = (H5D_mpio_actual_chunk_opt_mode_t)va_arg(ap, int);
+
+ switch(chunk_opt_mode) {
+ case H5D_MPIO_NO_CHUNK_OPTIMIZATION:
+ fprintf(out, "H5D_MPIO_NO_CHUNK_OPTIMIZATION");
+ break;
+
+ case H5D_MPIO_LINK_CHUNK:
+ fprintf(out, "H5D_MPIO_LINK_CHUNK");
+ break;
+
+ case H5D_MPIO_MULTI_CHUNK:
+ fprintf(out, "H5D_MPIO_MULTI_CHUNK");
+ break;
+
+ case H5D_MPIO_MULTI_CHUNK_NO_OPT:
+ fprintf(out, "H5D_MPIO_MULTI_CHUNK_NO_OPT");
+ break;
+
+ default:
+ fprintf(out, "%ld", (long)chunk_opt_mode);
+ break;
+ } /* end switch */
+ } /* end else */
+ break;
+
case 's':
if(ptr) {
if(vp)