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 e8db3c61c18a86478632a4b543890ef2d5332b1c (commit) from 2aaf74f0e571ad66600f008be2d89828c90e04c0 (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/e8db3c61c18a86478632a4b543890ef2d5... commit e8db3c61c18a86478632a4b543890ef2d5332b1c Author: Ken Raffenetti <[email protected]> Date: Tue Jun 24 22:47:05 2014 -0500 allow timeout of zero in bscu_wait_for_completion When hydra detects a timeout has occured, its method for killing everything is to call HYDT_bsci_wait_for_completion with a timeout of zero. However, the zero timeout value was ignored and processes were not explicitly killed. Allowing for a value of zero makes timeout more reliable and ensures mpiexec returns a non-zero status to the user. Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/pm/hydra/tools/bootstrap/utils/bscu_wait.c b/src/pm/hydra/tools/bootstrap/utils/bscu_wait.c index ba4366b..21148f1 100644 --- a/src/pm/hydra/tools/bootstrap/utils/bscu_wait.c +++ b/src/pm/hydra/tools/bootstrap/utils/bscu_wait.c @@ -41,7 +41,7 @@ HYD_status HYDT_bscu_wait_for_completion(int timeout) time_elapsed = (now.tv_sec - start.tv_sec); /* Ignore microsec granularity */ time_left = -1; - if (timeout > 0) { + if (timeout >= 0) { if (time_elapsed > timeout) { #if defined(HAVE_GETPGID) && defined(HAVE_SETSID) /* If we are able to get the process group ID, ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/bootstrap/utils/bscu_wait.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository