===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -p -r1.15 -r1.19
--- OpenXM_contrib2/asir2000/io/tcpf.c	2000/10/06 06:05:23	1.15
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2000/11/15 01:20:27	1.19
@@ -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.14 2000/09/27 09:27:24 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.18 2000/11/13 03:36:03 noro Exp $ 
 */
 #if INET
 #include "ca.h"
@@ -59,7 +59,7 @@
 
 #if defined(VISUAL)
 #include <stdlib.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <process.h>
 #endif
 
@@ -76,15 +76,21 @@ static struct m_c {
 } *m_c_tab;
 
 static int m_c_i,m_c_s;
+int I_am_server;
 
 #if MPI
 extern int mpi_nprocs;
 #define valid_mctab_index(ind)\
 if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");}
+#define check_valid_mctab_index(ind)\
+if((ind)<0||(ind)>=mpi_nprocs){(ind)=-1;}
 #else
 #define valid_mctab_index(ind)\
 if((ind)<0||(ind)>=m_c_i||\
 ((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){error("invalid server id");}
+#define check_valid_mctab_index(ind)\
+if((ind)<0||(ind)>=m_c_i||\
+((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){(ind)=-1;}
 #endif
 
 int register_server();
@@ -487,14 +493,15 @@ char *control_port_str,*server_port_str;
 {
 	char cmd[BUFSIZ];
 	char localhost[BUFSIZ];
-	char *dname,*conn_str,*rsh;
+	char *dname,*conn_str,*rsh,*dname0;
 	char dname_str[BUFSIZ];
 	char AsirExe[BUFSIZ];
 	STRING rootdir;
 	char prog[BUFSIZ];
 	char *av[BUFSIZ];
 
-	dname = use_x ? (char *)getenv("DISPLAY") : 0;
+	dname0 = (char *)getenv("DISPLAY");
+	dname = use_x ? dname0 : 0;
 	conn_str = conn_to_serv ? "1" : "0";
 	rsh = getenv("ASIR_RSH");
 	if ( !rsh )
@@ -536,7 +543,7 @@ char *control_port_str,*server_port_str;
 					control_port_str,server_port_str,server,dname,0);
 			else
 				execlp(launcher,launcher,".",conn_str,
-					control_port_str,server_port_str,server,"0",0);
+					control_port_str,server_port_str,server,dname0,"-nolog",0);
 		}
 	} else if ( conn_to_serv == 2 ) {
 		/* special support for java */
@@ -566,9 +573,9 @@ char *control_port_str,*server_port_str;
 				control_port_str,server_port_str,server,dname);
 		else
 			sprintf(cmd,
-"%s -n %s \"%s %s %s %s %s %s %s >&/dev/null&\">/dev/null",
+"%s -n %s \"%s %s %s %s %s %s %s %s>&/dev/null&\">/dev/null",
 				rsh,host,launcher,localhost,conn_str,
-				control_port_str,server_port_str,server,"0");
+				control_port_str,server_port_str,server,dname0,"-nolog");
 		system(cmd);
 	}
 #endif /* VISUAL */
@@ -1135,6 +1142,10 @@ 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 ( m_c_tab[index].af_unix )
 		wait(&status);
@@ -1157,3 +1168,29 @@ Q *rp;
 	*rp = 0;
 }
 #endif
+
+void shutdown_all() {
+	int s;
+	int i,index;
+	int status;
+
+	for ( i = I_am_server?1:0; i < m_c_i; i++ ) {
+		index = i;
+		check_valid_mctab_index(index);
+		if ( index < 0 )
+			continue;
+		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 ( m_c_tab[index].af_unix )
+			wait(&status);
+#endif
+		m_c_tab[index].m = 0; m_c_tab[index].c = 0;
+		m_c_tab[index].af_unix = 0;
+	}
+}