[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-203-ga5748c7
Service Account
noreply at mpich.org
Thu Feb 18 11:28:02 CST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via a5748c7c039db29cf6a4cee5316251ecee1a7f9c (commit)
via 3b4dcea64224cdb24c0bf1664c9e743b401c0ff3 (commit)
from e0e55b74047115b594681955ce12a50d0d65bedd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/a5748c7c039db29cf6a4cee5316251ecee1a7f9c
commit a5748c7c039db29cf6a4cee5316251ecee1a7f9c
Author: Pavan Balaji <balaji at anl.gov>
Date: Tue Feb 2 12:12:58 2016 -0600
mpidbg: common code must use its own dbg class.
Using ch3 debug classes in common code is incorrect.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpid/common/sock/poll/mpidu_socki.h b/src/mpid/common/sock/poll/mpidu_socki.h
index 5958dfe..8f862fb 100644
--- a/src/mpid/common/sock/poll/mpidu_socki.h
+++ b/src/mpid/common/sock/poll/mpidu_socki.h
@@ -55,4 +55,8 @@ MPID_STATE_WRITE, \
MPID_STATE_WRITEV, \
MPID_STATE_POLL,
+#if defined (MPL_USE_DBG_LOGGING)
+extern MPL_dbg_class MPIDU_DBG_SOCK_CONNECT;
+#endif /* MPL_USE_DBG_LOGGING */
+
#endif /* !defined(SOCKI_H_INCLUDED) */
diff --git a/src/mpid/common/sock/poll/sock_init.i b/src/mpid/common/sock/poll/sock_init.i
index 26c0868..018db73 100644
--- a/src/mpid/common/sock/poll/sock_init.i
+++ b/src/mpid/common/sock/poll/sock_init.i
@@ -5,6 +5,10 @@
* See COPYRIGHT in top-level directory.
*/
+#if defined (MPL_USE_DBG_LOGGING)
+MPL_dbg_class MPIDU_DBG_SOCK_CONNECT;
+#endif /* MPL_USE_DBG_LOGGING */
+
/* FIXME: The usual missing documentation (what are these routines for?
preconditions? who calls? post conditions? */
#undef FUNCNAME
@@ -17,6 +21,10 @@ int MPIDU_Sock_init(void)
MPIDI_FUNC_ENTER(MPID_STATE_MPIDU_SOCK_INIT);
+#if defined (MPL_USE_DBG_LOGGING)
+ MPIDU_DBG_SOCK_CONNECT = MPL_dbg_class_alloc("SOCK_CONNECT", "sock_connect");
+#endif
+
MPIDU_Socki_initialized++;
MPIDI_FUNC_EXIT(MPID_STATE_MPIDU_SOCK_INIT);
diff --git a/src/mpid/common/sock/poll/sock_post.i b/src/mpid/common/sock/poll/sock_post.i
index ea510b2..8005466 100644
--- a/src/mpid/common/sock/poll/sock_post.i
+++ b/src/mpid/common/sock/poll/sock_post.i
@@ -125,10 +125,10 @@ int MPIDU_Sock_post_connect_ifaddr( struct MPIDU_Sock_set * sock_set,
/*
* Attempt to establish the connection
*/
- MPL_DBG_STMT(MPIDI_CH3_DBG_CONNECT,TYPICAL,{
+ MPL_DBG_STMT(MPIDU_DBG_SOCK_CONNECT,TYPICAL,{
char addrString[64];
MPIDU_Sock_AddrToStr( ifaddr, addrString, sizeof(addrString) );
- MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT,TYPICAL,(MPL_DBG_FDEST,
+ MPL_DBG_MSG_FMT(MPIDU_DBG_SOCK_CONNECT,TYPICAL,(MPL_DBG_FDEST,
"Connecting to %s:%d", addrString, port ));
})
@@ -141,7 +141,7 @@ int MPIDU_Sock_post_connect_ifaddr( struct MPIDU_Sock_set * sock_set,
if (rc == 0)
{
/* connection succeeded */
- MPL_DBG_MSG_P(MPIDI_CH3_DBG_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_CONNECTED_RW for sock %p",sock);
+ MPL_DBG_MSG_P(MPIDU_DBG_SOCK_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_CONNECTED_RW for sock %p",sock);
pollinfo->state = MPIDU_SOCKI_STATE_CONNECTED_RW;
MPIDU_SOCKI_EVENT_ENQUEUE(pollinfo, MPIDU_SOCK_OP_CONNECT, 0, user_ptr, MPI_SUCCESS, mpi_errno, fn_fail);
}
@@ -149,13 +149,13 @@ int MPIDU_Sock_post_connect_ifaddr( struct MPIDU_Sock_set * sock_set,
else if (errno == EINPROGRESS)
{
/* connection pending */
- MPL_DBG_MSG_P(MPIDI_CH3_DBG_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_CONNECTING for sock %p",sock);
+ MPL_DBG_MSG_P(MPIDU_DBG_SOCK_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_CONNECTING for sock %p",sock);
pollinfo->state = MPIDU_SOCKI_STATE_CONNECTING;
MPIDU_SOCKI_POLLFD_OP_SET(pollfd, pollinfo, POLLOUT);
}
else
{
- MPL_DBG_MSG_P(MPIDI_CH3_DBG_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_DISCONNECTED (failure in connect) for sock %p",sock);
+ MPL_DBG_MSG_P(MPIDU_DBG_SOCK_CONNECT,TYPICAL,"Setting state to SOCKI_STATE_DISCONNECTED (failure in connect) for sock %p",sock);
pollinfo->os_errno = errno;
pollinfo->state = MPIDU_SOCKI_STATE_DISCONNECTED;
diff --git a/src/mpid/common/sock/poll/socki_util.i b/src/mpid/common/sock/poll/socki_util.i
index f9dde27..98e6e33 100644
--- a/src/mpid/common/sock/poll/socki_util.i
+++ b/src/mpid/common/sock/poll/socki_util.i
@@ -988,7 +988,7 @@ int MPIDU_Sock_SetSockBufferSize( int fd, int firm )
if (rc <= 0) {
sockBufSize = 0;
}
- MPL_DBG_MSG_D(MPIDI_CH3_DBG_CONNECT,TYPICAL,"Sock buf size = %d",sockBufSize);
+ MPL_DBG_MSG_D(MPIDU_DBG_SOCK_CONNECT,TYPICAL,"Sock buf size = %d",sockBufSize);
}
if (sockBufSize > 0) {
http://git.mpich.org/mpich.git/commitdiff/3b4dcea64224cdb24c0bf1664c9e743b401c0ff3
commit 3b4dcea64224cdb24c0bf1664c9e743b401c0ff3
Author: Pavan Balaji <balaji at anl.gov>
Date: Mon Feb 1 17:31:16 2016 -0600
mpl: namespace cleanup to use MPL_<lowercase>.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/glue/romio/glue_romio.c b/src/glue/romio/glue_romio.c
index c3521c2..6080327 100644
--- a/src/glue/romio/glue_romio.c
+++ b/src/glue/romio/glue_romio.c
@@ -12,7 +12,7 @@
#include "glue_romio.h"
#if defined (MPL_USE_DBG_LOGGING)
-static MPL_DBG_Class DBG_ROMIO;
+static MPL_dbg_class DBG_ROMIO;
#endif /* MPL_USE_DBG_LOGGING */
int MPIR_Ext_dbg_romio_terse_enabled = 0;
@@ -28,7 +28,7 @@ int MPIR_Ext_init(void)
MPIR_Ext_dbg_romio_verbose_enabled = 0;
#if defined (MPL_USE_DBG_LOGGING)
- DBG_ROMIO = MPL_DBG_Class_alloc("ROMIO", "romio");
+ DBG_ROMIO = MPL_dbg_class_alloc("ROMIO", "romio");
if (MPL_DBG_SELECTED(DBG_ROMIO,TERSE))
MPIR_Ext_dbg_romio_terse_enabled = 1;
diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h
index 02f30a7..a5bf419 100644
--- a/src/include/mpihandlemem.h
+++ b/src/include/mpihandlemem.h
@@ -119,7 +119,7 @@ const char *MPIU_Handle_get_kind_str(int kind);
#define HANDLE_INDEX(a) ((a)& HANDLE_MASK)
#if defined (MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIR_DBG_HANDLE;
+extern MPL_dbg_class MPIR_DBG_HANDLE;
#endif /* MPL_USE_DBG_LOGGING */
/* ------------------------------------------------------------------------- */
diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index 72ad697..23ef928 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -2170,16 +2170,16 @@ typedef struct MPICH_PerProcess_t {
extern MPICH_PerProcess_t MPIR_Process;
#if defined (MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIR_DBG_INIT;
-extern MPL_DBG_Class MPIR_DBG_PT2PT;
-extern MPL_DBG_Class MPIR_DBG_THREAD;
-extern MPL_DBG_Class MPIR_DBG_DATATYPE;
-extern MPL_DBG_Class MPIR_DBG_COMM;
-extern MPL_DBG_Class MPIR_DBG_BSEND;
-extern MPL_DBG_Class MPIR_DBG_ERRHAND;
-extern MPL_DBG_Class MPIR_DBG_OTHER;
-
-extern MPL_DBG_Class MPIR_DBG_ASSERT;
+extern MPL_dbg_class MPIR_DBG_INIT;
+extern MPL_dbg_class MPIR_DBG_PT2PT;
+extern MPL_dbg_class MPIR_DBG_THREAD;
+extern MPL_dbg_class MPIR_DBG_DATATYPE;
+extern MPL_dbg_class MPIR_DBG_COMM;
+extern MPL_dbg_class MPIR_DBG_BSEND;
+extern MPL_dbg_class MPIR_DBG_ERRHAND;
+extern MPL_dbg_class MPIR_DBG_OTHER;
+
+extern MPL_dbg_class MPIR_DBG_ASSERT;
#endif /* MPL_USE_DBG_LOGGING */
/* ------------------------------------------------------------------------- */
diff --git a/src/include/mpimem.h b/src/include/mpimem.h
index a247452..9250f4d 100644
--- a/src/include/mpimem.h
+++ b/src/include/mpimem.h
@@ -30,7 +30,7 @@ extern "C" {
#endif
#if defined (MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIR_DBG_STRING;
+extern MPL_dbg_class MPIR_DBG_STRING;
#endif /* MPL_USE_DBG_LOGGING */
/* ------------------------------------------------------------------------- */
diff --git a/src/mpi/init/init.c b/src/mpi/init/init.c
index 00ccf01..b15489f 100644
--- a/src/mpi/init/init.c
+++ b/src/mpi/init/init.c
@@ -127,7 +127,7 @@ int MPI_Init( int *argc, char ***argv )
rc = MPID_Wtime_init();
#ifdef MPL_USE_DBG_LOGGING
- MPL_DBG_PreInit( argc, argv, rc );
+ MPL_dbg_pre_init( argc, argv, rc );
#endif
MPID_MPI_INIT_FUNC_ENTER(MPID_STATE_MPI_INIT);
diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c
index fcd5888..f061094 100644
--- a/src/mpi/init/initthread.c
+++ b/src/mpi/init/initthread.c
@@ -295,19 +295,19 @@ MPI_F08_Status *MPI_F08_STATUSES_IGNORE = &MPIR_F08_MPI_STATUSES_IGNORE_OBJ[0];
#endif
#if defined (MPL_USE_DBG_LOGGING)
-MPL_DBG_Class MPIR_DBG_INIT;
-MPL_DBG_Class MPIR_DBG_PT2PT;
-MPL_DBG_Class MPIR_DBG_THREAD;
-MPL_DBG_Class MPIR_DBG_DATATYPE;
-MPL_DBG_Class MPIR_DBG_HANDLE;
-MPL_DBG_Class MPIR_DBG_COMM;
-MPL_DBG_Class MPIR_DBG_BSEND;
-MPL_DBG_Class MPIR_DBG_ERRHAND;
-MPL_DBG_Class MPIR_DBG_OTHER;
+MPL_dbg_class MPIR_DBG_INIT;
+MPL_dbg_class MPIR_DBG_PT2PT;
+MPL_dbg_class MPIR_DBG_THREAD;
+MPL_dbg_class MPIR_DBG_DATATYPE;
+MPL_dbg_class MPIR_DBG_HANDLE;
+MPL_dbg_class MPIR_DBG_COMM;
+MPL_dbg_class MPIR_DBG_BSEND;
+MPL_dbg_class MPIR_DBG_ERRHAND;
+MPL_dbg_class MPIR_DBG_OTHER;
/* these classes might need to move out later */
-MPL_DBG_Class MPIR_DBG_ASSERT;
-MPL_DBG_Class MPIR_DBG_STRING;
+MPL_dbg_class MPIR_DBG_ASSERT;
+MPL_dbg_class MPIR_DBG_STRING;
#endif /* MPL_USE_DBG_LOGGING */
#undef FUNCNAME
@@ -542,27 +542,27 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided)
* If the parent comm is not NULL, we always give the world number
* as "1" (false). */
#ifdef MPICH_IS_THREADED
- MPL_DBG_Init( argc, argv, has_args, has_env,
+ MPL_dbg_init( argc, argv, has_args, has_env,
MPIR_Process.comm_parent != NULL, MPIR_Process.comm_world->rank,
MPIR_ThreadInfo.isThreaded );
#else
- MPL_DBG_Init( argc, argv, has_args, has_env,
+ MPL_dbg_init( argc, argv, has_args, has_env,
MPIR_Process.comm_parent != NULL, MPIR_Process.comm_world->rank,
0 );
#endif
- MPIR_DBG_INIT = MPL_DBG_Class_alloc("INIT", "init");
- MPIR_DBG_PT2PT = MPL_DBG_Class_alloc("PT2PT", "pt2pt");
- MPIR_DBG_THREAD = MPL_DBG_Class_alloc("THREAD", "thread");
- MPIR_DBG_DATATYPE = MPL_DBG_Class_alloc("DATATYPE", "datatype");
- MPIR_DBG_HANDLE = MPL_DBG_Class_alloc("HANDLE", "handle");
- MPIR_DBG_COMM = MPL_DBG_Class_alloc("COMM", "comm");
- MPIR_DBG_BSEND = MPL_DBG_Class_alloc("BSEND", "bsend");
- MPIR_DBG_ERRHAND = MPL_DBG_Class_alloc("ERRHAND", "errhand");
- MPIR_DBG_OTHER = MPL_DBG_Class_alloc("OTHER", "other");
-
- MPIR_DBG_ASSERT = MPL_DBG_Class_alloc("ASSERT", "assert");
- MPIR_DBG_STRING = MPL_DBG_Class_alloc("STRING", "string");
+ MPIR_DBG_INIT = MPL_dbg_class_alloc("INIT", "init");
+ MPIR_DBG_PT2PT = MPL_dbg_class_alloc("PT2PT", "pt2pt");
+ MPIR_DBG_THREAD = MPL_dbg_class_alloc("THREAD", "thread");
+ MPIR_DBG_DATATYPE = MPL_dbg_class_alloc("DATATYPE", "datatype");
+ MPIR_DBG_HANDLE = MPL_dbg_class_alloc("HANDLE", "handle");
+ MPIR_DBG_COMM = MPL_dbg_class_alloc("COMM", "comm");
+ MPIR_DBG_BSEND = MPL_dbg_class_alloc("BSEND", "bsend");
+ MPIR_DBG_ERRHAND = MPL_dbg_class_alloc("ERRHAND", "errhand");
+ MPIR_DBG_OTHER = MPL_dbg_class_alloc("OTHER", "other");
+
+ MPIR_DBG_ASSERT = MPL_dbg_class_alloc("ASSERT", "assert");
+ MPIR_DBG_STRING = MPL_dbg_class_alloc("STRING", "string");
#endif
/* Initialize the C versions of the Fortran link-time constants.
@@ -662,7 +662,7 @@ int MPI_Init_thread( int *argc, char ***argv, int required, int *provided )
rc = MPID_Wtime_init();
#ifdef MPL_USE_DBG_LOGGING
- MPL_DBG_PreInit( argc, argv, rc );
+ MPL_dbg_pre_init( argc, argv, rc );
#endif
MPID_MPI_INIT_FUNC_ENTER(MPID_STATE_MPI_INIT_THREAD);
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h
index 56d6aa4..1cf13af 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_impl.h
@@ -21,7 +21,7 @@ extern struct pollfd *MPID_nem_tcp_plfd_tbl;
extern sockconn_t MPID_nem_tcp_g_lstn_sc;
extern struct pollfd MPID_nem_tcp_g_lstn_plfd;
-extern MPL_DBG_Class MPIDI_NEM_TCP_DBG_DET;
+extern MPL_dbg_class MPIDI_NEM_TCP_DBG_DET;
typedef enum{MPID_NEM_TCP_VC_STATE_DISCONNECTED,
MPID_NEM_TCP_VC_STATE_CONNECTED,
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
index 62b18fe..4fbcef7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
@@ -112,7 +112,7 @@ MPID_nem_netmod_funcs_t MPIDI_nem_tcp_funcs = {
/* in case there are no packet types defined (e.g., they're ifdef'ed out) make sure the array is not zero length */
static MPIDI_CH3_PktHandler_Fcn *pkt_handlers[MPIDI_NEM_TCP_PKT_NUM_TYPES ? MPIDI_NEM_TCP_PKT_NUM_TYPES : 1];
-MPL_DBG_Class MPIDI_NEM_TCP_DBG_DET;
+MPL_dbg_class MPIDI_NEM_TCP_DBG_DET;
#undef FUNCNAME
#define FUNCNAME set_up_listener
@@ -166,7 +166,7 @@ int MPID_nem_tcp_init (MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_
MPIU_Assert(sizeof(MPID_nem_tcp_vc_area) <= MPIDI_NEM_VC_NETMOD_AREA_LEN);
#if defined (MPL_USE_DBG_LOGGING)
- MPIDI_NEM_TCP_DBG_DET = MPL_DBG_Class_alloc("MPIDI_NEM_TCP_DBG_DET", "nem_sock_det");
+ MPIDI_NEM_TCP_DBG_DET = MPL_dbg_class_alloc("MPIDI_NEM_TCP_DBG_DET", "nem_sock_det");
#endif /* MPL_USE_DBG_LOGGING */
/* set up listener socket */
diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h
index 2ef9bec..142a8c8 100644
--- a/src/mpid/ch3/include/mpidimpl.h
+++ b/src/mpid/ch3/include/mpidimpl.h
@@ -48,14 +48,14 @@ extern char *MPIDI_failed_procs_string;
extern int MPIDI_Use_pmi2_api;
#if defined(MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIDI_CH3_DBG_CONNECT;
-extern MPL_DBG_Class MPIDI_CH3_DBG_DISCONNECT;
-extern MPL_DBG_Class MPIDI_CH3_DBG_PROGRESS;
-extern MPL_DBG_Class MPIDI_CH3_DBG_CHANNEL;
-extern MPL_DBG_Class MPIDI_CH3_DBG_OTHER;
-extern MPL_DBG_Class MPIDI_CH3_DBG_MSG;
-extern MPL_DBG_Class MPIDI_CH3_DBG_VC;
-extern MPL_DBG_Class MPIDI_CH3_DBG_REFCOUNT;
+extern MPL_dbg_class MPIDI_CH3_DBG_CONNECT;
+extern MPL_dbg_class MPIDI_CH3_DBG_DISCONNECT;
+extern MPL_dbg_class MPIDI_CH3_DBG_PROGRESS;
+extern MPL_dbg_class MPIDI_CH3_DBG_CHANNEL;
+extern MPL_dbg_class MPIDI_CH3_DBG_OTHER;
+extern MPL_dbg_class MPIDI_CH3_DBG_MSG;
+extern MPL_dbg_class MPIDI_CH3_DBG_VC;
+extern MPL_dbg_class MPIDI_CH3_DBG_REFCOUNT;
#endif /* MPL_USE_DBG_LOGGING */
#define MPIDI_CHANGE_VC_STATE(vc, new_state) do { \
diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c
index 3f364d2..a4a551d 100644
--- a/src/mpid/ch3/src/mpid_init.c
+++ b/src/mpid/ch3/src/mpid_init.c
@@ -44,14 +44,14 @@ MPIDI_CH3U_Win_hooks_t MPIDI_CH3U_Win_hooks = { NULL };
MPIDI_CH3U_Win_pkt_ordering_t MPIDI_CH3U_Win_pkt_orderings = { 0 };
#if defined(MPL_USE_DBG_LOGGING)
-MPL_DBG_Class MPIDI_CH3_DBG_CONNECT;
-MPL_DBG_Class MPIDI_CH3_DBG_DISCONNECT;
-MPL_DBG_Class MPIDI_CH3_DBG_PROGRESS;
-MPL_DBG_Class MPIDI_CH3_DBG_CHANNEL;
-MPL_DBG_Class MPIDI_CH3_DBG_OTHER;
-MPL_DBG_Class MPIDI_CH3_DBG_MSG;
-MPL_DBG_Class MPIDI_CH3_DBG_VC;
-MPL_DBG_Class MPIDI_CH3_DBG_REFCOUNT;
+MPL_dbg_class MPIDI_CH3_DBG_CONNECT;
+MPL_dbg_class MPIDI_CH3_DBG_DISCONNECT;
+MPL_dbg_class MPIDI_CH3_DBG_PROGRESS;
+MPL_dbg_class MPIDI_CH3_DBG_CHANNEL;
+MPL_dbg_class MPIDI_CH3_DBG_OTHER;
+MPL_dbg_class MPIDI_CH3_DBG_MSG;
+MPL_dbg_class MPIDI_CH3_DBG_VC;
+MPL_dbg_class MPIDI_CH3_DBG_REFCOUNT;
#endif /* MPL_USE_DBG_LOGGING */
#undef FUNCNAME
@@ -190,14 +190,14 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided,
MPIDI_CH3_Win_hooks_init(&MPIDI_CH3U_Win_hooks);
#ifdef MPL_USE_DBG_LOGGING
- MPIDI_CH3_DBG_CONNECT = MPL_DBG_Class_alloc("CH3_CONNECT", "ch3_connect");;
- MPIDI_CH3_DBG_DISCONNECT = MPL_DBG_Class_alloc("CH3_DISCONNECT", "ch3_disconnect");
- MPIDI_CH3_DBG_PROGRESS = MPL_DBG_Class_alloc("CH3_PROGRESS", "ch3_progress");
- MPIDI_CH3_DBG_CHANNEL = MPL_DBG_Class_alloc("CH3_CHANNEL", "ch3_channel");
- MPIDI_CH3_DBG_OTHER = MPL_DBG_Class_alloc("CH3_OTHER", "ch3_other");
- MPIDI_CH3_DBG_MSG = MPL_DBG_Class_alloc("CH3_MSG", "ch3_msg");
- MPIDI_CH3_DBG_VC = MPL_DBG_Class_alloc("VC", "vc");
- MPIDI_CH3_DBG_REFCOUNT = MPL_DBG_Class_alloc("REFCOUNT", "refcount");
+ MPIDI_CH3_DBG_CONNECT = MPL_dbg_class_alloc("CH3_CONNECT", "ch3_connect");;
+ MPIDI_CH3_DBG_DISCONNECT = MPL_dbg_class_alloc("CH3_DISCONNECT", "ch3_disconnect");
+ MPIDI_CH3_DBG_PROGRESS = MPL_dbg_class_alloc("CH3_PROGRESS", "ch3_progress");
+ MPIDI_CH3_DBG_CHANNEL = MPL_dbg_class_alloc("CH3_CHANNEL", "ch3_channel");
+ MPIDI_CH3_DBG_OTHER = MPL_dbg_class_alloc("CH3_OTHER", "ch3_other");
+ MPIDI_CH3_DBG_MSG = MPL_dbg_class_alloc("CH3_MSG", "ch3_msg");
+ MPIDI_CH3_DBG_VC = MPL_dbg_class_alloc("VC", "vc");
+ MPIDI_CH3_DBG_REFCOUNT = MPL_dbg_class_alloc("REFCOUNT", "refcount");
#endif /* MPL_USE_DBG_LOGGING */
/*
diff --git a/src/mpid/ch3/src/mpidi_pg.c b/src/mpid/ch3/src/mpidi_pg.c
index 68bc98f..ac619a6 100644
--- a/src/mpid/ch3/src/mpidi_pg.c
+++ b/src/mpid/ch3/src/mpidi_pg.c
@@ -1030,8 +1030,8 @@ int MPIDI_PrintConnStr( const char *file, int line,
{
int pg_size, i;
- MPL_DBG_Outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", label );
- MPL_DBG_Outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );
+ MPL_dbg_outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", label );
+ MPL_dbg_outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );
/* Skip the pg id */
while (*str) str++; str++;
@@ -1041,7 +1041,7 @@ int MPIDI_PrintConnStr( const char *file, int line,
while (*str) str++; str++;
for (i=0; i<pg_size; i++) {
- MPL_DBG_Outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );
+ MPL_dbg_outevent( file, line, MPIDI_CH3_DBG_CONNECT, 0, "%s", str );
while (*str) str++;
str++;
}
diff --git a/src/mpid/common/hcoll/hcoll.h b/src/mpid/common/hcoll/hcoll.h
index 601359e..a2a186f 100644
--- a/src/mpid/common/hcoll/hcoll.h
+++ b/src/mpid/common/hcoll/hcoll.h
@@ -14,7 +14,7 @@
extern int world_comm_destroying;
#if defined(MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIR_DBG_HCOLL;
+extern MPL_dbg_class MPIR_DBG_HCOLL;
#endif /* MPL_USE_DBG_LOGGING */
int hcoll_comm_create(MPID_Comm * comm, void *param);
diff --git a/src/mpid/common/hcoll/hcoll_init.c b/src/mpid/common/hcoll/hcoll_init.c
index 750cc94..dfd5b5c 100644
--- a/src/mpid/common/hcoll/hcoll_init.c
+++ b/src/mpid/common/hcoll/hcoll_init.c
@@ -23,7 +23,7 @@ int hcoll_comm_attr_keyval = MPI_KEYVAL_INVALID;
int world_comm_destroying = 0;
#if defined(MPL_USE_DBG_LOGGING)
-MPL_DBG_Class MPIR_DBG_HCOLL;
+MPL_dbg_class MPIR_DBG_HCOLL;
#endif /* MPL_USE_DBG_LOGGING */
#undef FUNCNAME
@@ -79,7 +79,7 @@ int hcoll_initialize(void)
}
#if defined(MPL_USE_DBG_LOGGING)
- MPIR_DBG_HCOLL = MPL_DBG_Class_alloc("HCOLL", "hcoll");
+ MPIR_DBG_HCOLL = MPL_dbg_class_alloc("HCOLL", "hcoll");
#endif /* MPL_USE_DBG_LOGGING */
hcoll_rte_fns_setup();
diff --git a/src/mpl/include/mpl_argstr.h b/src/mpl/include/mpl_argstr.h
index 78a4d60..3943043 100644
--- a/src/mpl/include/mpl_argstr.h
+++ b/src/mpl/include/mpl_argstr.h
@@ -15,7 +15,7 @@
#include "mpl_dbg.h"
#if defined (MPL_USE_DBG_LOGGING)
-extern MPL_DBG_Class MPIR_DBG_STRING;
+extern MPL_dbg_class MPIR_DBG_STRING;
#endif /* MPL_USE_DBG_LOGGING */
#define MPL_STR_SUCCESS 0
diff --git a/src/mpl/include/mpl_dbg.h b/src/mpl/include/mpl_dbg.h
index 6587f90..df50f0d 100644
--- a/src/mpl/include/mpl_dbg.h
+++ b/src/mpl/include/mpl_dbg.h
@@ -23,33 +23,33 @@
#ifdef MPL_USE_DBG_LOGGING
#define MPL_DBG_SELECTED(_class, _level) \
- ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel)
+ ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level)
#define MPL_DBG_MSG(_class, _level, _string) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 0, "%s", _string); \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 0, "%s", _string); \
} \
}
#define MPL_DBG_MSG_S(_class, _level, _fmat, _string) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 1, _fmat, _string); \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 1, _fmat, _string); \
} \
}
#define MPL_DBG_MSG_D(_class, _level, _fmat, _int) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 2, _fmat, _int); \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 2, _fmat, _int); \
} \
}
#define MPL_DBG_MSG_P(_class, _level, _fmat, _pointer) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 3, _fmat, _pointer); \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 3, _fmat, _pointer); \
} \
}
@@ -68,28 +68,28 @@
#define MPL_DBG_MSG_FMT(_class, _level, _fmatargs) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
char _s[MPL_DBG_MAXLINE]; \
MPL_snprintf _fmatargs ; \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 0, "%s", _s); \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 0, "%s", _s); \
} \
}
#define MPL_DBG_STMT(_class, _level, _stmt) \
{ \
- if ((_class & MPL_DBG_ActiveClasses) && MPL_DBG_##_level <= MPL_DBG_MaxLevel) { \
+ if ((_class & MPL_dbg_active_classes) && MPL_DBG_##_level <= MPL_dbg_max_level) { \
_stmt; \
} \
}
#define MPL_DBG_OUT(_class, _msg) \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 0, "%s", _msg)
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 0, "%s", _msg)
#define MPL_DBG_OUT_FMT(_class,_fmatargs) \
{ \
char _s[MPL_DBG_MAXLINE]; \
MPL_snprintf _fmatargs ; \
- MPL_DBG_Outevent(__FILE__, __LINE__, _class, 0, "%s", _s); \
+ MPL_dbg_outevent(__FILE__, __LINE__, _class, 0, "%s", _s); \
}
#else
@@ -108,7 +108,7 @@
#define MPL_DBG_ERR_INTERN 1
#define MPL_DBG_ERR_OTHER 2
-typedef unsigned int MPL_DBG_Class;
+typedef unsigned int MPL_dbg_class;
/* Special constants */
enum MPL_DBG_LEVEL {
@@ -117,16 +117,16 @@ enum MPL_DBG_LEVEL {
MPL_DBG_VERBOSE = 99
};
-extern int MPL_DBG_ActiveClasses;
-extern int MPL_DBG_MaxLevel;
+extern int MPL_dbg_active_classes;
+extern int MPL_dbg_max_level;
-extern MPL_DBG_Class MPL_DBG_ROUTINE_ENTER;
-extern MPL_DBG_Class MPL_DBG_ROUTINE_EXIT;
-extern MPL_DBG_Class MPL_DBG_ROUTINE;
-extern MPL_DBG_Class MPL_DBG_ALL;
+extern MPL_dbg_class MPL_DBG_ROUTINE_ENTER;
+extern MPL_dbg_class MPL_DBG_ROUTINE_EXIT;
+extern MPL_dbg_class MPL_DBG_ROUTINE;
+extern MPL_dbg_class MPL_DBG_ALL;
-MPL_DBG_Class MPL_DBG_Class_alloc(const char *ucname, const char *lcname);
-void MPL_DBG_Class_register(MPL_DBG_Class class, const char *ucname, const char *lcname);
+MPL_dbg_class MPL_dbg_class_alloc(const char *ucname, const char *lcname);
+void MPL_dbg_class_register(MPL_dbg_class class, const char *ucname, const char *lcname);
#define MPL_DBG_CLASS_CLR(class) \
do { \
@@ -139,10 +139,10 @@ void MPL_DBG_Class_register(MPL_DBG_Class class, const char *ucname, const char
} while (0)
/* *INDENT-OFF* */
-int MPL_DBG_Outevent(const char *, int, int, int, const char *, ...) ATTRIBUTE((format(printf, 5, 6)));
+int MPL_dbg_outevent(const char *, int, int, int, const char *, ...) ATTRIBUTE((format(printf, 5, 6)));
/* *INDENT-ON* */
-int MPL_DBG_Init(int *, char ***, int, int, int, int, int);
-int MPL_DBG_PreInit(int *, char ***, int);
+int MPL_dbg_init(int *, char ***, int, int, int, int, int);
+int MPL_dbg_pre_init(int *, char ***, int);
#endif
diff --git a/src/mpl/src/dbg/mpl_dbg.c b/src/mpl/src/dbg/mpl_dbg.c
index 1df23e4..761e147 100644
--- a/src/mpl/src/dbg/mpl_dbg.c
+++ b/src/mpl/src/dbg/mpl_dbg.c
@@ -33,8 +33,8 @@ extern FILE *fdopen(int fd, const char *mode);
#define MAXPATHLEN 1024
#endif
-int MPL_DBG_ActiveClasses = 0;
-int MPL_DBG_MaxLevel = MPL_DBG_TYPICAL;
+int MPL_dbg_active_classes = 0;
+int MPL_dbg_max_level = MPL_DBG_TYPICAL;
static enum {
DBG_UNINIT,
@@ -136,7 +136,7 @@ static void set_fp(FILE * fp)
dbg_static_fp = fp;
}
-int MPL_DBG_Outevent(const char *file, int line, int class, int kind, const char *fmat, ...)
+int MPL_dbg_outevent(const char *file, int line, int class, int kind, const char *fmat, ...)
{
int mpl_errno = MPL_DBG_SUCCESS;
va_list list;
@@ -251,7 +251,7 @@ static const int level_values[] = {
static const char *level_name[] = { "TERSE", "TYPICAL", "VERBOSE", 0 };
static const char *lc_level_name[] = { "terse", "typical", "verbose", 0 };
-void MPL_DBG_Class_register(MPL_DBG_Class class, const char *ucname, const char *lcname)
+void MPL_dbg_class_register(MPL_dbg_class class, const char *ucname, const char *lcname)
{
int i, j;
@@ -270,7 +270,7 @@ void MPL_DBG_Class_register(MPL_DBG_Class class, const char *ucname, const char
if (len == slen && (strncmp(unregistered_classes[i], lcname, len) ||
strncmp(unregistered_classes[i], ucname, len))) {
/* got a match */
- MPL_DBG_ActiveClasses |= class;
+ MPL_dbg_active_classes |= class;
for (j = i; j < num_unregistered_classes - 1; j++)
unregistered_classes[j] = unregistered_classes[j + 1];
num_unregistered_classes--;
@@ -280,12 +280,12 @@ void MPL_DBG_Class_register(MPL_DBG_Class class, const char *ucname, const char
}
}
-MPL_DBG_Class MPL_DBG_Class_alloc(const char *ucname, const char *lcname)
+MPL_dbg_class MPL_dbg_class_alloc(const char *ucname, const char *lcname)
{
static unsigned int class = 1;
/* create a user handle for this class */
- MPL_DBG_Class_register(class, ucname, lcname);
+ MPL_dbg_class_register(class, ucname, lcname);
class <<= 1;
@@ -314,13 +314,13 @@ static int dbg_process_args(int *argc_p, char ***argv_p)
/* Found a command */
if (*s == 0) {
/* Just -mpich-dbg */
- MPL_DBG_MaxLevel = MPL_DBG_TYPICAL;
- MPL_DBG_ActiveClasses = MPL_DBG_ALL;
+ MPL_dbg_max_level = MPL_DBG_TYPICAL;
+ MPL_dbg_active_classes = MPL_DBG_ALL;
}
else if (*s == '=') {
/* look for file */
- MPL_DBG_MaxLevel = MPL_DBG_TYPICAL;
- MPL_DBG_ActiveClasses = MPL_DBG_ALL;
+ MPL_dbg_max_level = MPL_DBG_TYPICAL;
+ MPL_dbg_active_classes = MPL_DBG_ALL;
s++;
if (strncmp(s, "file", 4) == 0) {
file_pattern = default_file_pattern;
@@ -390,8 +390,8 @@ static int dbg_process_env(void)
s = getenv("MPICH_DBG");
if (s) {
/* Set the defaults */
- MPL_DBG_MaxLevel = MPL_DBG_TYPICAL;
- MPL_DBG_ActiveClasses = MPL_DBG_ALL;
+ MPL_dbg_max_level = MPL_DBG_TYPICAL;
+ MPL_dbg_active_classes = MPL_DBG_ALL;
if (strncmp(s, "FILE", 4) == 0) {
file_pattern = default_file_pattern;
}
@@ -428,17 +428,17 @@ static int dbg_process_env(void)
return MPL_DBG_SUCCESS;
}
-MPL_DBG_Class MPL_DBG_ROUTINE_ENTER;
-MPL_DBG_Class MPL_DBG_ROUTINE_EXIT;
-MPL_DBG_Class MPL_DBG_ROUTINE;
-MPL_DBG_Class MPL_DBG_ALL = ~(0); /* pre-initialize the ALL class */
+MPL_dbg_class MPL_DBG_ROUTINE_ENTER;
+MPL_dbg_class MPL_DBG_ROUTINE_EXIT;
+MPL_dbg_class MPL_DBG_ROUTINE;
+MPL_dbg_class MPL_DBG_ALL = ~(0); /* pre-initialize the ALL class */
/*
* Attempt to initialize the logging system. This works only if the
* full initialization is not required for updating the environment
* and/or command-line arguments.
*/
-int MPL_DBG_PreInit(int *argc_p, char ***argv_p, int wtimeNotReady)
+int MPL_dbg_pre_init(int *argc_p, char ***argv_p, int wtimeNotReady)
{
MPL_time_t t;
@@ -465,22 +465,22 @@ int MPL_DBG_PreInit(int *argc_p, char ***argv_p, int wtimeNotReady)
}
/* Allocate the predefined classes */
- MPL_DBG_ROUTINE_ENTER = MPL_DBG_Class_alloc("ROUTINE_ENTER", "routine_enter");
- MPL_DBG_ROUTINE_EXIT = MPL_DBG_Class_alloc("ROUTINE_EXIT", "routine_exit");
+ MPL_DBG_ROUTINE_ENTER = MPL_dbg_class_alloc("ROUTINE_ENTER", "routine_enter");
+ MPL_DBG_ROUTINE_EXIT = MPL_dbg_class_alloc("ROUTINE_EXIT", "routine_exit");
MPL_DBG_CLASS_CLR(MPL_DBG_ROUTINE);
MPL_DBG_CLASS_APPEND(MPL_DBG_ROUTINE, MPL_DBG_ROUTINE_ENTER);
MPL_DBG_CLASS_APPEND(MPL_DBG_ROUTINE, MPL_DBG_ROUTINE_EXIT);
- MPL_DBG_Class_register(MPL_DBG_ROUTINE, "ROUTINE", "routine");
+ MPL_dbg_class_register(MPL_DBG_ROUTINE, "ROUTINE", "routine");
- MPL_DBG_Class_register(MPL_DBG_ALL, "ALL", "all");
+ MPL_dbg_class_register(MPL_DBG_ALL, "ALL", "all");
dbg_initialized = DBG_PREINIT;
return MPL_DBG_SUCCESS;
}
-int MPL_DBG_Init(int *argc_p, char ***argv_p, int has_args, int has_env,
+int MPL_dbg_init(int *argc_p, char ***argv_p, int has_args, int has_env,
int wnum, int wrank, int threaded)
{
int ret;
@@ -528,7 +528,7 @@ int MPL_DBG_Init(int *argc_p, char ***argv_p, int has_args, int has_env,
if (which_rank >= 0 && which_rank != wrank) {
/* Turn off logging on this process */
- MPL_DBG_ActiveClasses = 0;
+ MPL_dbg_active_classes = 0;
}
/* If the file has already been opened with a temp filename,
@@ -891,7 +891,7 @@ static int dbg_openfile(FILE ** dbg_fp)
}
/* Support routines for processing mpich-dbg values */
-/* Update the GLOBAL variable MPL_DBG_ActiveClasses with the bits
+/* Update the GLOBAL variable MPL_dbg_active_classes with the bits
* corresponding to this name */
static int dbg_set_class(const char *s)
{
@@ -911,7 +911,7 @@ static int dbg_set_class(const char *s)
if (slen == len && (strncmp(str, classnames[i].lcname, len) ||
strncmp(str, classnames[i].ucname, len))) {
/* we have a match */
- MPL_DBG_ActiveClasses |= classnames[i].classbits;
+ MPL_dbg_active_classes |= classnames[i].classbits;
found_match = 1;
break;
}
@@ -931,7 +931,7 @@ static int dbg_set_class(const char *s)
return 0;
}
-/* Set the global MPL_DBG_MaxLevel if there is a match with the known
+/* Set the global MPL_dbg_max_level if there is a match with the known
* level names */
static int dbg_set_level(const char *s, const char *(names[]))
{
@@ -939,7 +939,7 @@ static int dbg_set_level(const char *s, const char *(names[]))
for (i = 0; names[i]; i++) {
if (strcmp(names[i], s) == 0) {
- MPL_DBG_MaxLevel = level_values[i];
+ MPL_dbg_max_level = level_values[i];
return 0;
}
}
-----------------------------------------------------------------------
Summary of changes:
src/glue/romio/glue_romio.c | 4 +-
src/include/mpihandlemem.h | 2 +-
src/include/mpiimpl.h | 20 ++++----
src/include/mpimem.h | 2 +-
src/mpi/init/init.c | 2 +-
src/mpi/init/initthread.c | 52 +++++++++---------
.../ch3/channels/nemesis/netmod/tcp/tcp_impl.h | 2 +-
.../ch3/channels/nemesis/netmod/tcp/tcp_init.c | 4 +-
src/mpid/ch3/include/mpidimpl.h | 16 +++---
src/mpid/ch3/src/mpid_init.c | 32 ++++++------
src/mpid/ch3/src/mpidi_pg.c | 6 +-
src/mpid/common/hcoll/hcoll.h | 2 +-
src/mpid/common/hcoll/hcoll_init.c | 4 +-
src/mpid/common/sock/poll/mpidu_socki.h | 4 ++
src/mpid/common/sock/poll/sock_init.i | 8 +++
src/mpid/common/sock/poll/sock_post.i | 10 ++--
src/mpid/common/sock/poll/socki_util.i | 2 +-
src/mpl/include/mpl_argstr.h | 2 +-
src/mpl/include/mpl_dbg.h | 52 +++++++++---------
src/mpl/src/dbg/mpl_dbg.c | 56 ++++++++++----------
20 files changed, 147 insertions(+), 135 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list