[mpich2-commits] r3999 - in mpich2/trunk/src/pm/hydra: include launcher/mpiexec utils/timer

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-10 16:34:44 -0500 (Tue, 10 Mar 2009)
New Revision: 3999

Modified:
   mpich2/trunk/src/pm/hydra/include/hydra_utils.h
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
   mpich2/trunk/src/pm/hydra/utils/timer/timer.c
Log:
Missed some changes in the function arguments.

Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-03-10 21:18:00 UTC (rev 3998)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-03-10 21:34:44 UTC (rev 3999)
@@ -164,7 +164,7 @@
 #include <time.h>
 #endif /* HAVE_TIME */
 typedef struct timeval HYD_Time;
-void HYDU_Time_set(HYD_Time time, int * val);
+void HYDU_Time_set(HYD_Time * time, int * val);
 int HYDU_Time_left(HYD_Time start, HYD_Time timeout);
 
 

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c	2009-03-10 21:18:00 UTC (rev 3998)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/mpiexec.c	2009-03-10 21:34:44 UTC (rev 3999)
@@ -92,7 +92,7 @@
         timeout = atoi(getenv("MPIEXEC_TIMEOUT"));
     else
         timeout = -1; /* Set a negative timeout */
-    HYD_Time_set(&handle.timeout, &timeout);
+    HYDU_Time_set(&handle.timeout, &timeout);
 
     /* Launch the processes */
     status = HYD_CSI_Launch_procs();

Modified: mpich2/trunk/src/pm/hydra/utils/timer/timer.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/timer/timer.c	2009-03-10 21:18:00 UTC (rev 3998)
+++ mpich2/trunk/src/pm/hydra/utils/timer/timer.c	2009-03-10 21:34:44 UTC (rev 3999)
@@ -8,15 +8,15 @@
 
 /* FIXME: Here we assume that the timer is gettimeofday. */
 
-void HYDU_Time_set(HYD_Time time, int * val)
+void HYDU_Time_set(HYD_Time * time, int * val)
 {
     if (val == NULL) {
         /* Set time to right now */
-        gettimeofday(&time, NULL);
+        gettimeofday(time, NULL);
     }
     else {
-        time.tv_sec = *val;
-        time.tv_usec = 0;
+        time->tv_sec = *val;
+        time->tv_usec = 0;
     }
 }