Changeset 5650

Timestamp:

10/31/09 15:44:35 (3 weeks ago)

Author:

balaji

Message:

Bug fix for the failing timeout test in the nightly tests.

Files:

• mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c (modified) (2 diffs)

mpich2/trunk/src/pm/hydra/pm/pmiserv/pmi_serv_launch.c

@@ -480 +480 @@
 {
     struct HYD_proxy *proxy;
-    int sockets_open, all_procs_exited;
+    int sockets_open, all_procs_exited, infinite = -1;
     HYD_status status = HYD_SUCCESS;
 
@@ -496 +496 @@
             HYDU_ERR_POP(status, "error waiting for event\n");
 
-            /* If the timeout expired, raise a SIGINT and kill all the
-             * processes */
+            /* timeout expired */
             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");
+
+                /* Reset timer to infinite */
+                HYDU_time_set(&HYD_handle.timeout, &infinite);
+                continue;
             }