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 9757bc209a06d08b9ffa2a4d068100b695aa05d8 (commit) via 27297c3c6993c95fa40266f42a551320944e281c (commit) from 3adb59cb83a4f675ba990062c62396d1a23483cf (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/9757bc209a06d08b9ffa2a4d068100b695... commit 9757bc209a06d08b9ffa2a4d068100b695aa05d8 Merge: 3adb59c 27297c3 Author: Pavan Balaji <[email protected]> Date: Wed May 1 14:55:03 2013 -0500 Merge remote-tracking branch 'mpich-ibm/ticket-1824'. http://git.mpich.org/mpich.git/commitdiff/27297c3c6993c95fa40266f42a55132094... commit 27297c3c6993c95fa40266f42a551320944e281c Author: Haizhu Liu <[email protected]> Date: Wed Jan 23 12:21:36 2013 -0500 Fix for dynamic multi threaded case (ibm) D188298 (ibm) 3b8da8c7c4fa02f23e1463296d51274b35f22764 Signed-off-by: Bob Cernohous <[email protected]> diff --git a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c index 00306fb..6e6c39d 100644 --- a/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c +++ b/src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c @@ -192,7 +192,6 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, } } - /* XXX DJG don't need this, PMI API is thread-safe? */ /*MPIU_THREAD_CS_ENTER(PMI,);*/ /* release the global CS for spawn PMI calls */ MPIU_THREAD_CS_EXIT(ALLFUNC,); @@ -204,6 +203,7 @@ int MPIDI_Comm_spawn_multiple(int count, char **commands, jobId, jobIdSize, pmi_errcodes); TRACE_ERR("after PMI2_Job_Spawn - pmi_errno=%d jobId=%s\n", pmi_errno, jobId); + MPIU_THREAD_CS_ENTER(ALLFUNC,); tmp=MPIU_Strdup(jobId); tmp_ret = atoi(strtok(tmp, ";")); ----------------------------------------------------------------------- Summary of changes: .../pamid/src/dyntask/mpid_comm_spawn_multiple.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository