diff options
| author | Dan Wells <dwells@cs.uiuc.edu> | 2001-04-24 21:20:05 (GMT) |
|---|---|---|
| committer | Dan Wells <dwells@cs.uiuc.edu> | 2001-04-24 21:20:05 (GMT) |
| commit | b3961ff99f4bd16b4c755b83e7cb531cfe444ced (patch) | |
| tree | f4c33ef3576f4823cd2bfc1158771e743c5dfb46 /pablo/PabloHDF_SDDF.c | |
| parent | bce863bc3abde48c85f11d9f5bbb8b61e93dc2c3 (diff) | |
| download | hdf5-b3961ff99f4bd16b4c755b83e7cb531cfe444ced.zip hdf5-b3961ff99f4bd16b4c755b83e7cb531cfe444ced.tar.gz hdf5-b3961ff99f4bd16b4c755b83e7cb531cfe444ced.tar.bz2 | |
[svn-r3851]
Purpose:
Bug fix.
Description:
The Pablo instrumentation would not build because the HAVE_PABLO flag
was renamed H5_HAVE_PABLO. Also, there were problems with MPI I/O
tracing when the MPI did not follow the MPI I/O standards exactly.A
Solution:
Renamed all conditional compiliation flags so that they begin H5_ .
Added entries HDF_MPI_xxx for all MPI I/O functions HDF_MPI_xxx used in
HDF. These functions record data, call the corresponding function
MPI_xxx directly, then record exit data. Previously this was done in
the MPI I/O portion of the Trace Library, but caused link conflicts.
Platforms tested:
IRIX64/IRIX32/Linux/Solaris/VClass32/VClass64
Diffstat (limited to 'pablo/PabloHDF_SDDF.c')
| -rw-r--r-- | pablo/PabloHDF_SDDF.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pablo/PabloHDF_SDDF.c b/pablo/PabloHDF_SDDF.c index 859047d..bf42112 100644 --- a/pablo/PabloHDF_SDDF.c +++ b/pablo/PabloHDF_SDDF.c @@ -57,14 +57,14 @@ //======================================================================*/ #include <stdio.h> -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL #include "mpi.h" #endif #include "H5config.h" -#undef HAVE_PABLO +#undef H5_HAVE_PABLO #include "H5private.h" -#define HAVE_PABLO +#define H5_HAVE_PABLO #include "ProcIDs.h" #include "SystemDepend.h" @@ -105,7 +105,7 @@ void endIOTrace( void ); #define returnRecord(x) return x; -#ifdef HAVE_MPIOTRACE +#ifdef H5_HAVE_MPIOTRACE int initMPIOTrace( char *, int ); void endMPIOTrace( void ) ; #else @@ -233,7 +233,7 @@ void HDFinitTrace_SDDF( char *traceFileName, int OUTSW ) // set traceFileName and set IO tracing switches. If MPIO * // tracing is available, MPIO tracing will also be initialized. * //==============================================================*/ -#ifdef HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL /*=============================================================== // The code is built to handle parallel processing using MPI. * // However, the code may or may not be run using MPI and there * @@ -254,13 +254,13 @@ void HDFinitTrace_SDDF( char *traceFileName, int OUTSW ) //===========================================================*/ MPI_Comm_rank( MPI_COMM_WORLD, &myNode ); setTraceProcessorNumber( myNode ); -#ifdef HAVE_MPIOTRACE +#ifdef H5_HAVE_MPIOTRACE /*============================================================ // MPIO Tracing is supported in the Pablo Library. Let the * // MPIO initialization be performed and handle the naming of * // trace files. * //===========================================================*/ - initMPIOTrace( traceFileName, RUNTIME_TRACE ); + initMPIOTrace( traceFileName, SUPPRESS_MPIO_TRACE ); #else /*============================================================ // MPIO tracing is not supported. * @@ -296,7 +296,7 @@ void HDFinitTrace_SDDF( char *traceFileName, int OUTSW ) disableLifetimeSummaries(); disableTimeWindowSummaries(); disableFileRegionSummaries(); -#endif /* HAVE_PARALLEL */ +#endif /* H5_HAVE_PARALLEL */ /*=============================================================== // complete HDF initiailization. * //==============================================================*/ @@ -826,4 +826,4 @@ void _hdfMiscDescriptor( void ) putBytes( recordBuffer, (unsigned) recordLength ); } -/*#endif */ /* HAVE_PABLO */ +/*#endif */ /* H5_HAVE_PABLO */ |