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 dd378f88fd2e1eec15975b77c155c6921008b258 (commit) from cac7e4b0632c134244b89b4dddb2cc5cac77847c (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/dd378f88fd2e1eec15975b77c155c69210... commit dd378f88fd2e1eec15975b77c155c6921008b258 Author: Pavan Balaji <[email protected]> Date: Thu Jan 28 21:10:44 2016 -0600 Bug-fix: protect multi-threading variables. MPIR_ThreadInfo.isThreaded is not available in single-threaded mode. diff --git a/src/mpi/init/initthread.c b/src/mpi/init/initthread.c index fcbfc91..a8629d3 100644 --- a/src/mpi/init/initthread.c +++ b/src/mpi/init/initthread.c @@ -527,7 +527,11 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) MPIU_Timer_init(MPIR_Process.comm_world->rank, MPIR_Process.comm_world->local_size); #ifdef USE_MEMORY_TRACING +#ifdef MPICH_IS_THREADED MPL_trinit( MPIR_Process.comm_world->rank, MPIR_ThreadInfo.isThreaded ); +#else + MPL_trinit( MPIR_Process.comm_world->rank, 0 ); +#endif /* Indicate that we are near the end of the init step; memory allocated already will have an id of zero; this helps separate memory leaks in the initialization code from @@ -537,9 +541,15 @@ int MPIR_Init_thread(int * argc, char ***argv, int required, int * provided) /* FIXME: This is a hack to handle the common case of two worlds. * 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, MPIR_Process.comm_parent != NULL, MPIR_Process.comm_world->rank, MPIR_ThreadInfo.isThreaded ); +#else + 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"); ----------------------------------------------------------------------- Summary of changes: src/mpi/init/initthread.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository