Updated MPICH-mpiexec patch for MPICH 1.2.4

[Ben Webb]

	While I'm in this generous patch-sharing mood, here's a patch
for MPICH 1.2.4 to have it work with mpiexec. It's essentially just the
mpich-1.2.3-alpha-020118-mpiexec.diff patch from the mpiexec
distribution, with minor formatting and context changes to get it to
apply cleanly to 1.2.4. Enjoy...

	Ben
-- 
ben at bellatrix.pcl.ox.ac.uk           http://bellatrix.pcl.ox.ac.uk/~ben/
"I have nothing to do to-day. My practice is never very absorbing."
	- Sir Arthur Conan Doyle
-------------- next part --------------
diff -Nur mpich-1.2.4/mpid/ch_p4/p4/lib/p4_bm.c mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_bm.c
--- mpich-1.2.4/mpid/ch_p4/p4/lib/p4_bm.c	Mon May  6 04:00:31 2002
+++ mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_bm.c	Mon May 13 18:47:01 2002
@@ -386,14 +386,14 @@
 #           ifdef CAN_DO_SOCKET_MSGS
 	    if (!(p4_global->local_communication_only))
 	    {
-#ifdef USE_NONBLOCKING_LISTENER_SOCKETS
+#ifndef USE_BLOCKING_LISTENER_SOCKETS
 		/* Set the listener socket to be nonblocking.  */
 		int rc = p4_make_socket_nonblocking( end_1 );
 		if (rc < 0) {
 		    p4_error("create_bm_processes: set listener nonblocking",
 			     rc);
 		}
-#endif /* USE_NONBLOCKING_LISTENER_SOCKETS */
+#endif /* USE_BLOCKING_LISTENER_SOCKETS */
 		p4_local->listener_fd = end_1;
 #               if !defined(THREAD_LISTENER)
 		close(end_2);
diff -Nur mpich-1.2.4/mpid/ch_p4/p4/lib/p4_rm.c mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_rm.c
--- mpich-1.2.4/mpid/ch_p4/p4/lib/p4_rm.c	Mon Apr  1 14:37:38 2002
+++ mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_rm.c	Mon May 13 18:47:11 2002
@@ -366,13 +366,13 @@
 
 #   if !defined(NO_LISTENER)
 	    {
-#ifdef USE_NONBLOCKING_LISTENER_SOCKETS
+#ifndef USE_BLOCKING_LISTENER_SOCKETS
 		int rc = p4_make_socket_nonblocking( end_1 );
 		if (rc < 0) {
 		    p4_error("create_rm_processes: set listener nonblocking",
 		      rc);
 		}
-#endif /* USE_NONBLOCKING_LISTENER_SOCKETS */
+#endif /* USE_BLOCKING_LISTENER_SOCKETS */
 		p4_local->listener_fd = end_1;
 #           if !defined(THREAD_LISTENER)
 	    close(end_2);
diff -Nur mpich-1.2.4/mpid/ch_p4/p4/lib/p4_sock_conn.c mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_sock_conn.c
--- mpich-1.2.4/mpid/ch_p4/p4/lib/p4_sock_conn.c	Thu Apr 25 18:58:56 2002
+++ mpich-1.2.4-patched/mpid/ch_p4/p4/lib/p4_sock_conn.c	Mon May 13 18:46:37 2002
@@ -330,7 +330,7 @@
     p4_dprintfl(70, "Inside handle_connection_interrupt fd=%d\n",p4_local->listener_fd);
     listener_fd = p4_local->listener_fd;
 
-#ifdef USE_NONBLOCKING_LISTENER_SOCKETS
+#ifndef USE_BLOCKING_LISTENER_SOCKETS
     /* This parameter gives the number of attempts to read before 
        deciding that something has gone wrong */
     #define MAX_DRY_ITERATIONS 1000000
@@ -372,7 +372,7 @@
 	p4_dprintf("OOPS: got eof in handle_connection_interrupt\n");
 	return;
     }
-#endif /* USE_NONBLOCKING_LISTENER_SOCKETS */
+#endif /* USE_BLOCKING_LISTENER_SOCKETS */
     type = p4_n_to_i(msg.type);
     if (type != CONNECTION_REQUEST)
     {