mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-06 17:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r26171] fix MPE setup.

Browse Source
This commit is contained in:
Mohamad Chaarawi 2015-02-13 16:21:00 -05:00
parent 8b98b9ee92
commit d38f3d888d
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -2361,7 +2361,6 @@ if test -n "$PARALLEL"; then
X-yes)
AC_CHECK_HEADERS([mpe.h],, [unset MPE])
AC_CHECK_LIB([mpe], [MPE_Init_log],, [unset MPE])
AC_CHECK_LIB([lmpe], [MPE_Init_mpi_io],, [unset MPE])
;;
*)
case "$withval" in
@ -2403,12 +2402,8 @@ if test -n "$PARALLEL"; then
AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
AC_CHECK_LIB([mpe], [MPE_Init_log],,
[LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE])
AC_CHECK_LIB([lmpe], [MPE_Init_mpi_io],,
[LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE])
else
AC_CHECK_LIB([mpe], [MPE_Init_log],, [unset MPE])
AC_CHECK_LIB([lmpe], [MPE_Init_mpi_io],, [unset MPE])
fi
;;
esac

37
src/H5private.h
View File

@ -214,10 +214,10 @@
*/
#define eventa(func_name) h5_mpe_eventa
#define eventb(func_name) h5_mpe_eventb
#define MPE_LOG_VARS \
static int eventa(FUNC) = -1; \
static int eventb(FUNC) = -1; \
const char* p_event_start = "start" FUNC;
#define MPE_LOG_VARS \
static int eventa(FUNC) = -1; \
static int eventb(FUNC) = -1; \
char p_event_start[100];
/* Hardwire the color to "red", since that's what all the routines are using
* now. In the future, if we want to change that color for a given routine,
@ -226,16 +226,17 @@
* color information down to the BEGIN_MPE_LOG macro (which should have a new
* BEGIN_MPE_LOG_COLOR variant). -QAK
*/
#define BEGIN_MPE_LOG \
if (H5_MPEinit_g){ \
if (eventa(FUNC) == -1 && eventb(FUNC) == -1) { \
const char* p_color = "red"; \
eventa(FUNC)=MPE_Log_get_event_number(); \
eventb(FUNC)=MPE_Log_get_event_number(); \
MPE_Describe_state(eventa(FUNC), eventb(FUNC), (char *)FUNC, (char *)p_color); \
} \
MPE_Log_event(eventa(FUNC), 0, (char *)p_event_start); \
}
#define BEGIN_MPE_LOG \
if (H5_MPEinit_g){ \
sprintf(p_event_start, "start %s", FUNC); \
if (eventa(FUNC) == -1 && eventb(FUNC) == -1) { \
const char* p_color = "red"; \
eventa(FUNC)=MPE_Log_get_event_number(); \
eventb(FUNC)=MPE_Log_get_event_number(); \
MPE_Describe_state(eventa(FUNC), eventb(FUNC), FUNC, p_color); \
} \
MPE_Log_event(eventa(FUNC), 0, p_event_start); \
}
/*------------------------------------------------------------------------
@ -244,9 +245,9 @@
*
* Programmer: Long Wang
*/
#define FINISH_MPE_LOG \
if (H5_MPEinit_g) { \
MPE_Log_event(eventb(FUNC), 0, (char *)FUNC); \
#define FINISH_MPE_LOG \
if (H5_MPEinit_g) { \
MPE_Log_event(eventb(FUNC), 0, FUNC); \
}
#else /* H5_HAVE_MPE */
@ -1851,7 +1852,7 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
/* Local variables for API routines */
#define FUNC_ENTER_API_VARS \
MPE_LOG_VARS \
MPE_LOG_VARS \
H5TRACE_DECL
#define FUNC_ENTER_API_COMMON \