mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-17 16:10:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r21529] Description:

Browse Source 
Update tracing information with new types introduced in "actual I/O mode"
query routines.

Tested on:
    bin/reconfigure on jam
This commit is contained in:
Quincey Koziol 2011-10-12 14:16:32 -05:00
parent d1fb88d51c
commit 5f8a03a2bf
4 changed files with 78 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/trace
View File

@ -36,7 +36,9 @@ $Source = "";
"H5D_fill_time_t" => "Df",
"H5D_fill_value_t" => "DF",
"H5FD_mpio_chunk_opt_t" => "Dh",
"H5D_mpio_actual_io_mode_t" => "Di",
"H5D_layout_t" => "Dl",
"H5D_mpio_actual_chunk_opt_mode_t" => "Do",
"H5D_space_status_t" => "Ds",
"H5FD_mpio_xfer_t" => "Dt",
"herr_t" => "e",

2
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 21499 2011-10-09 14:02:51Z hdftest .
# From configure.in Id: configure.in 21525 2011-10-11 23:59:40Z brtnfld .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HDF5 1.9.95.
#

6
src/H5Pdxpl.c
View File

@ -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)))

72
src/H5trace.c
View File

@ -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)