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 c47e0fba0dfd8753c605e1d130ea2d63cd824bd3 (commit) from 380b32a7a8172c7f5485fc0787ddd6d346617cd2 (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/c47e0fba0dfd8753c605e1d130ea2d63cd... commit c47e0fba0dfd8753c605e1d130ea2d63cd824bd3 Author: Ken Raffenetti <[email protected]> Date: Thu Aug 13 08:45:22 2015 -0500 pm/gforker: fix compile errors related to code refactor diff --git a/src/pm/util/Makefile.mk b/src/pm/util/Makefile.mk index 41a250d..59508a2 100644 --- a/src/pm/util/Makefile.mk +++ b/src/pm/util/Makefile.mk @@ -48,7 +48,7 @@ src_pm_util_libmpiexec_a_SOURCES = \ src/pm/util/dbgiface.c \ src/pm/util/safestr2.c \ src/pm/util/simple_pmiutil2.c \ - src/util/msgs/msgprint.c + src/mpl/src/mplmsg.c endif BUILD_PM_UTIL diff --git a/src/pm/util/pmiserv.c b/src/pm/util/pmiserv.c index 46f7c90..2d310b7 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_internal_error_printf( "Could not set environment PMI_FD" ); + MPL_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_internal_error_printf( "Could not set environment PMI_PORT" ); + MPL_error_printf( "Could not set environment PMI_PORT" ); perror( "Reason: " ); return 1; } } else { - MPL_internal_error_printf( "Required portname was not defined\n" ); + MPL_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_internal_error_printf( "too many kvs's\n" ); + MPL_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_internal_error_printf( "Could not find KV Space %s\n", + MPL_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_internal_error_printf( "Group has no associated KVS" ); + MPL_error_printf( "Group has no associated KVS" ); return -1; } PMIWriteLine( pentry->fd, outbuf ); ----------------------------------------------------------------------- Summary of changes: src/pm/util/Makefile.mk | 2 +- src/pm/util/pmiserv.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository