[mpich2-commits] r4063 - in mpich2/trunk/src/pm/hydra: bootstrap/utils include launcher/mpiexec pm/central utils/args utils/sock

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-03-13 18:26:11 -0500 (Fri, 13 Mar 2009)
New Revision: 4063

Modified:
   mpich2/trunk/src/pm/hydra/bootstrap/utils/bscu_wait.c
   mpich2/trunk/src/pm/hydra/include/hydra_base.h
   mpich2/trunk/src/pm/hydra/include/hydra_utils.h
   mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
   mpich2/trunk/src/pm/hydra/pm/central/proxy_utils.c
   mpich2/trunk/src/pm/hydra/utils/args/args.c
   mpich2/trunk/src/pm/hydra/utils/sock/sock.c
Log:
Warning stomp.


Modified: mpich2/trunk/src/pm/hydra/bootstrap/utils/bscu_wait.c
===================================================================
--- mpich2/trunk/src/pm/hydra/bootstrap/utils/bscu_wait.c	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/bootstrap/utils/bscu_wait.c	2009-03-13 23:26:11 UTC (rev 4063)
@@ -66,10 +66,6 @@
     if (not_completed)
         status = HYD_INTERNAL_ERROR;
 
-  fn_exit:
     HYDU_FUNC_EXIT();
     return status;
-
-  fn_fail:
-    goto fn_exit;
 }

Modified: mpich2/trunk/src/pm/hydra/include/hydra_base.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_base.h	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/include/hydra_base.h	2009-03-13 23:26:11 UTC (rev 4063)
@@ -36,9 +36,14 @@
 #endif /* HAVE_SYS_TYPES_H */
 
 #include <errno.h>
+
+#if defined HAVE_GETTIMEOFDAY
 /* FIXME: Is time.h available everywhere? We should probably have
  * multiple timer options like MPICH2. */
 #include <time.h>
+#include <sys/time.h>
+#endif /* HAVE_GETTIMEOFDAY */
+
 #include "mpimem.h"
 
 #if defined MAXHOSTNAMELEN

Modified: mpich2/trunk/src/pm/hydra/include/hydra_utils.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/include/hydra_utils.h	2009-03-13 23:26:11 UTC (rev 4063)
@@ -9,7 +9,6 @@
 
 #include "hydra_base.h"
 
-
 /* Environment utilities */
 HYD_Status HYDU_Env_global_list(HYD_Env_t ** env_list);
 HYD_Env_t *HYDU_Env_dup(HYD_Env_t env);
@@ -146,9 +145,9 @@
 HYD_Status HYDU_Sock_connect(const char *host, uint16_t port, int *fd);
 HYD_Status HYDU_Sock_accept(int listen_fd, int *fd);
 HYD_Status HYDU_Sock_readline(int fd, char *buf, int maxlen, int *linelen);
-HYD_Status HYDU_Sock_read(int fd, char *buf, int maxlen, int *count);
+HYD_Status HYDU_Sock_read(int fd, void *buf, int maxlen, int *count);
 HYD_Status HYDU_Sock_writeline(int fd, char *buf, int maxsize);
-HYD_Status HYDU_Sock_write(int fd, char *buf, int maxsize);
+HYD_Status HYDU_Sock_write(int fd, void *buf, int maxsize);
 HYD_Status HYDU_Sock_set_nonblock(int fd);
 HYD_Status HYDU_Sock_set_cloexec(int fd);
 HYD_Status HYDU_Sock_stdout_cb(int fd, HYD_Event_t events, int stdout_fd, int *closed);

Modified: mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c	2009-03-13 23:26:11 UTC (rev 4063)
@@ -220,7 +220,7 @@
                         HYDU_Error_printf("unable to add env to list\n");
                         goto fn_fail;
                     }
-                } while (env_name = strtok(NULL, ","));
+                } while ((env_name = strtok(NULL, ",")));
             }
             continue;
         }

Modified: mpich2/trunk/src/pm/hydra/pm/central/proxy_utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/pm/central/proxy_utils.c	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/pm/central/proxy_utils.c	2009-03-13 23:26:11 UTC (rev 4063)
@@ -15,7 +15,6 @@
     char **argv = t_argv;
     int arg, i, count;
     struct HYD_Partition_list *partition, *run;
-    HYD_Env_t *found, env;
     HYD_Status status = HYD_SUCCESS;
 
     HYDU_FUNC_ENTER();

Modified: mpich2/trunk/src/pm/hydra/utils/args/args.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/args/args.c	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/utils/args/args.c	2009-03-13 23:26:11 UTC (rev 4063)
@@ -118,18 +118,13 @@
         *path = MPIU_Strdup("");
     }
 
-  fn_exit:
     HYDU_FUNC_EXIT();
     return status;
-
-  fn_fail:
-    goto fn_exit;
 }
 
 
 HYD_Status HYDU_Chdir(const char *dir)
 {
-    char *home;
     HYD_Status status = HYD_SUCCESS;
 
     HYDU_FUNC_ENTER();

Modified: mpich2/trunk/src/pm/hydra/utils/sock/sock.c
===================================================================
--- mpich2/trunk/src/pm/hydra/utils/sock/sock.c	2009-03-13 23:08:21 UTC (rev 4062)
+++ mpich2/trunk/src/pm/hydra/utils/sock/sock.c	2009-03-13 23:26:11 UTC (rev 4063)
@@ -135,7 +135,6 @@
 {
     struct sockaddr_in sa;
     struct hostent *ht;
-    int one = 1;
     HYD_Status status = HYD_SUCCESS;
 
     HYDU_FUNC_ENTER();
@@ -257,7 +256,7 @@
 /*
  * HYD_Sock_read: perform a blocking read on a non-blocking socket.
  */
-HYD_Status HYDU_Sock_read(int fd, char *buf, int maxlen, int *count)
+HYD_Status HYDU_Sock_read(int fd, void *buf, int maxlen, int *count)
 {
     HYD_Status status = HYD_SUCCESS;
 
@@ -314,7 +313,7 @@
 }
 
 
-HYD_Status HYDU_Sock_write(int fd, char *buf, int maxsize)
+HYD_Status HYDU_Sock_write(int fd, void *buf, int maxsize)
 {
     int n;
     HYD_Status status = HYD_SUCCESS;