===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.34
retrieving revision 1.41
diff -u -p -r1.34 -r1.41
--- OpenXM_contrib2/asir2000/io/tcpf.c	2002/08/02 09:43:12	1.34
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2003/05/23 00:11:58	1.41
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.33 2002/08/02 02:28:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.40 2003/03/12 07:56:23 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -79,7 +79,7 @@ static struct m_c {
 static int m_c_i,m_c_s;
 int I_am_server;
 
-#if MPI
+#if defined(MPI)
 extern int mpi_nprocs;
 #define valid_mctab_index(ind)\
 if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");}
@@ -143,11 +143,11 @@ struct ftab tcp_tab[] = {
 	{"ox_cmo_rpc",Pox_cmo_rpc,-99999999},
 
 	{"ox_sync",Pox_sync,1},
-#if MPI
+#if defined(MPI)
 	{"ox_mpi_myid",Pox_mpi_myid,0},
 	{"ox_mpi_nprocs",Pox_mpi_nprocs,0},
 #endif
-#if !MPI
+#if !defined(MPI)
 	{"ox_reset",Pox_reset,-2},
 	{"ox_intr",Pox_intr,1},
 	{"ox_select",Pox_select,-2},
@@ -183,7 +183,7 @@ extern int ox_exchange_mathcap;
 
 char *getenv();
 
-#if MPI
+#if defined(MPI)
 extern int mpi_myid, mpi_nprocs;
 
 void Pox_mpi_myid(Q *rp)
@@ -205,7 +205,7 @@ void Pox_get_serverinfo(NODE arg,LIST *rp)
 	LIST list,l;
 
 	if ( !arg ) {
-		for ( i = 0, n0 = 0; i < m_c_i; i++ )
+		for ( i = I_am_server?1:0, n0 = 0; i < m_c_i; i++ )
 			if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) {
 				c = m_c_tab[i].c;
 				ox_get_serverinfo(c,&list);
@@ -425,17 +425,23 @@ void ox_launch_generic(char *host,char *launcher,char 
 		generate_port(use_unix,server_port_str);
 		if ( !conn_to_serv ) {
 			cs = try_bind_listen(use_unix,control_port_str);
+			if ( cs < 0 ) continue;
 			ss = try_bind_listen(use_unix,server_port_str);
+			if ( ss < 0 ) continue;
 		}
 		spawn_server(host,launcher,server,
 			use_unix,use_ssh,use_x,conn_to_serv,
 				control_port_str,server_port_str);
 		if ( conn_to_serv ) {
 			cs = try_connect(use_unix,host,control_port_str);
+			if ( cs < 0 ) continue;
 			ss = try_connect(use_unix,host,server_port_str);
+			if ( ss < 0 ) continue;
 		} else {
 			cs = try_accept(use_unix,cs);
+			if ( cs < 0 ) continue;
 			ss = try_accept(use_unix,ss);
+			if ( ss < 0 ) continue;
 		}
 	} while ( cs < 0 || ss < 0 );
 
@@ -771,7 +777,7 @@ int register_server(int af_unix,int m,int c)
 		}
 		m_c_s = INIT_TAB_SIZ;
 	}
-#if !MPI
+#if !defined(MPI)
 	for ( i = 0; i < m_c_i; i++ )
 		if ( (m_c_tab[i].m<0) && (m_c_tab[i].c<0) )
 			break;
@@ -884,8 +890,11 @@ void Pox_push_local(NODE arg,Obj *rp)
 	int s;
 	struct oLIST dummy;
 	VL vl;
-	int index = QTOS((Q)ARG0(arg));
+	int index;
 
+	if ( !arg )
+		error("ox_push_local : too few arguments.");
+	index = QTOS((Q)ARG0(arg));
 	valid_mctab_index(index);
 	s = m_c_tab[index].c; arg = NEXT(arg);
 
@@ -901,8 +910,11 @@ void Pox_push_local(NODE arg,Obj *rp)
 void Pox_push_cmo(NODE arg,Obj *rp)
 {
 	int s;
-	int index = QTOS((Q)ARG0(arg));
+	int index;
 
+	if ( !arg )
+		error("ox_push_cmo : too few arguments.");
+	index = QTOS((Q)ARG0(arg));
 	valid_mctab_index(index);
 	s = m_c_tab[index].c; arg = NEXT(arg);
 	for ( ; arg; arg = NEXT(arg) )
@@ -1193,11 +1205,9 @@ void Pox_shutdown(NODE arg,Q *rp)
 	s = m_c_tab[index].m;
 	ox_send_cmd(s,SM_shutdown);
 	free_iofp(s);
-#if !defined(VISUAL)
 	s = m_c_tab[index].c;
 	free_iofp(s);
-#endif
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL)
 	if ( m_c_tab[index].af_unix )
 		wait(&status);
 #endif
@@ -1235,11 +1245,9 @@ void shutdown_all() {
 	Sleep(1000);
 #endif
 		free_iofp(s);
-#if !defined(VISUAL)
 		s = m_c_tab[index].c;
 		free_iofp(s);
-#endif
-#if !MPI && !defined(VISUAL)
+#if !defined(MPI) && !defined(VISUAL)
 		if ( m_c_tab[index].af_unix )
 			wait(&status);
 #endif