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 26988c6a5a3e67e5170da9c9abc828d0e23604b8 (commit) from c47e0fba0dfd8753c605e1d130ea2d63cd824bd3 (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/26988c6a5a3e67e5170da9c9abc828d0e2... commit 26988c6a5a3e67e5170da9c9abc828d0e23604b8 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 13 11:07:42 2015 -0500 pm/gforker: fixup for [c47e0fba0dfd] Link to mpl instead of including specific files. Also, the internal error printf routines are still available. Use them where they were intended. Signed-off-by: Halim Amer <[email protected]> diff --git a/src/pm/gforker/Makefile.mk b/src/pm/gforker/Makefile.mk index 726148e..3a15605 100644 --- a/src/pm/gforker/Makefile.mk +++ b/src/pm/gforker/Makefile.mk @@ -16,7 +16,7 @@ if BUILD_PM_GFORKER if PRIMARY_PM_GFORKER bin_PROGRAMS += src/pm/gforker/mpiexec src_pm_gforker_mpiexec_SOURCES = src/pm/gforker/mpiexec.c -src_pm_gforker_mpiexec_LDADD = src/pm/util/libmpiexec.a +src_pm_gforker_mpiexec_LDADD = src/pm/util/libmpiexec.a $(mpllib) # we may not want to add AM_CPPFLAGS for this program src_pm_gforker_mpiexec_CPPFLAGS = $(common_pm_includes) $(AM_CPPFLAGS) else !PRIMARY_PM_GFORKER diff --git a/src/pm/util/Makefile.mk b/src/pm/util/Makefile.mk index 59508a2..83e273f 100644 --- a/src/pm/util/Makefile.mk +++ b/src/pm/util/Makefile.mk @@ -47,8 +47,7 @@ src_pm_util_libmpiexec_a_SOURCES = \ src/pm/util/pmiport.c \ src/pm/util/dbgiface.c \ src/pm/util/safestr2.c \ - src/pm/util/simple_pmiutil2.c \ - src/mpl/src/mplmsg.c + src/pm/util/simple_pmiutil2.c endif BUILD_PM_UTIL diff --git a/src/pm/util/pmiserv.c b/src/pm/util/pmiserv.c index 2d310b7..5376ded 100644 --- a/src/pm/util/pmiserv.c +++ b/src/pm/util/pmiserv.c @@ -172,7 +172,7 @@ int PMISetupInClient( int usePort, PMISetup *pmiinfo ) MPL_snprintf( env_pmi_fd, sizeof(env_pmi_fd), "PMI_FD=%d" , pmiinfo->fdpair[1] ); if (MPIE_Putenv( pmiinfo->pWorld, env_pmi_fd )) { - MPL_error_printf( "Could not set environment PMI_FD" ); + MPL_internal_error_printf( "Could not set environment PMI_FD" ); return 1; } } @@ -182,13 +182,13 @@ int PMISetupInClient( int usePort, PMISetup *pmiinfo ) MPL_snprintf( env_pmi_port, sizeof(env_pmi_port), "PMI_PORT=%s", pmiinfo->portName ); if (MPIE_Putenv( pmiinfo->pWorld, env_pmi_port )) { - MPL_error_printf( "Could not set environment PMI_PORT" ); + MPL_internal_error_printf( "Could not set environment PMI_PORT" ); perror( "Reason: " ); return 1; } } else { - MPL_error_printf( "Required portname was not defined\n" ); + MPL_internal_error_printf( "Required portname was not defined\n" ); return 1; } @@ -458,7 +458,7 @@ static PMIKVSpace *fPMIKVSAllocate( void ) /* Create the space */ kvs = (PMIKVSpace *)MPIU_Malloc( sizeof(PMIKVSpace) ); if (!kvs) { - MPL_error_printf( "too many kvs's\n" ); + MPL_internal_error_printf( "too many kvs's\n" ); return 0; } /* We include the pid of the PMI server as a way to allow multiple @@ -615,7 +615,7 @@ static int PMIKVSFree( PMIKVSpace *kvs ) /* Note that if we did not find the kvs, we have an internal error, since all kv spaces are maintained within the pmimaster list */ if (rc != 0) { - MPL_error_printf( "Could not find KV Space %s\n", + MPL_internal_error_printf( "Could not find KV Space %s\n", kvs->kvsname ); return 1; } @@ -767,7 +767,7 @@ static int fPMI_Handle_get_my_kvsname( PMIProcess *pentry ) kvs->kvsname ); } else { - MPL_error_printf( "Group has no associated KVS" ); + MPL_internal_error_printf( "Group has no associated KVS" ); return -1; } PMIWriteLine( pentry->fd, outbuf ); ----------------------------------------------------------------------- Summary of changes: src/pm/gforker/Makefile.mk | 2 +- src/pm/util/Makefile.mk | 3 +-- src/pm/util/pmiserv.c | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository