[mpich2-commits] r7476 - mpich2/trunk/src/pm/hydra/tools/bootstrap/external

[balaji at mcs.anl.gov]

Author: balaji
Date: 2010-11-22 09:55:38 -0600 (Mon, 22 Nov 2010)
New Revision: 7476

Modified:
   mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_launch.c
   mpich2/trunk/src/pm/hydra/tools/bootstrap/external/ll_launch.c
   mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_launch.c
Log:
Bug-fix to the stdin socket information.

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_launch.c	2010-11-22 15:55:07 UTC (rev 7475)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_launch.c	2010-11-22 15:55:38 UTC (rev 7476)
@@ -289,7 +289,8 @@
         /* Register stdio callbacks for the spawned process */
         if (i == 0 && enable_stdin) {
             fd = STDIN_FILENO;
-            status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdio_cb);
+            status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+                                          (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
             HYDU_ERR_POP(status, "demux returned error registering fd\n");
         }
 

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/ll_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/ll_launch.c	2010-11-22 15:55:07 UTC (rev 7475)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/ll_launch.c	2010-11-22 15:55:38 UTC (rev 7476)
@@ -100,7 +100,8 @@
     /* Register stdio callbacks for the spawned process */
     if (enable_stdin) {
         fd = STDIN_FILENO;
-        status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdio_cb);
+        status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+                                      (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
         HYDU_ERR_POP(status, "demux returned error registering fd\n");
     }
 

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_launch.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_launch.c	2010-11-22 15:55:07 UTC (rev 7475)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_launch.c	2010-11-22 15:55:38 UTC (rev 7476)
@@ -153,7 +153,8 @@
     /* Register stdio callbacks for the spawned process */
     if (enable_stdin) {
         fd = STDIN_FILENO;
-        status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN, &fd_stdin, HYDT_bscu_stdio_cb);
+        status = HYDT_dmx_register_fd(1, &fd, HYD_POLLIN,
+                                      (void *) (size_t) fd_stdin, HYDT_bscu_stdio_cb);
         HYDU_ERR_POP(status, "demux returned error registering fd\n");
     }