[mpich2-commits] r5649 - mpich2/trunk/src/pm/hydra/pm/pmiserv

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-31 13:12:56 -0500 (Sat, 31 Oct 2009)
New Revision: 5649

Modified:
   mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
Log:
Call the process cleanup directly instead of raising a signal and
expecting the signal handler to handle it (this is more reliable).

Modified: mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c	2009-10-31 16:16:16 UTC (rev 5648)
+++ mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c	2009-10-31 18:12:56 UTC (rev 5649)
@@ -497,8 +497,10 @@
 
             /* If the timeout expired, raise a SIGINT and kill all the
              * processes */
-            if (HYDU_time_left(HYD_handle.start, HYD_handle.timeout) == 0)
-                raise(SIGINT);
+            if (HYDU_time_left(HYD_handle.start, HYD_handle.timeout) == 0) {
+                status = HYD_pmcd_pmi_serv_cleanup();
+                HYDU_ERR_POP(status, "cleanup of processes failed\n");
+            }
 
             /* Check to see if there's any open read socket left; if
              * there are, we will just wait for more events. */