===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -p -r1.14 -r1.17
--- OpenXM_contrib2/asir2000/io/tcpf.c	2000/09/27 09:27:24	1.14
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2000/11/08 06:21:17	1.17
@@ -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.13 2000/09/25 04:33:37 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.16 2000/11/07 06:35:39 noro Exp $ 
 */
 #if INET
 #include "ca.h"
@@ -58,7 +58,9 @@
 #include "ox.h"
 
 #if defined(VISUAL)
+#include <stdlib.h>
 #include <winsock.h>
+#include <process.h>
 #endif
 
 #define OX_XTERM "ox_xterm"
@@ -74,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();
@@ -485,10 +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 )
@@ -501,7 +514,26 @@ char *control_port_str,*server_port_str;
 		use_ssh = 1;
 	}
 	gethostname(localhost,BUFSIZ);
-#if !defined(VISUAL)
+#if defined(VISUAL)
+	if ( !use_unix )
+		error("spawn_server : not implemented on Windows");
+	Pget_rootdir(&rootdir);
+	sprintf(AsirExe,"%s\\bin\\engine.exe",BDY(rootdir));
+	strcpy(prog,server);
+	server = strrchr(prog,'/')+1;
+	av[0] = "ox_launch";
+	av[1] = "127.0.0.1";
+	av[2] = conn_str;
+	av[3] = control_port_str;
+	av[4] = server_port_str;
+	av[5] = server;
+	av[6] = use_x ? "1" : "0";
+	av[7] = 0;
+
+	_spawnv(_P_NOWAIT,AsirExe,av);
+//	_spawnv(_P_NOWAIT,"d:\\home\\noro\\engine2000\\debug\\engine.exe",av);
+//	printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server);
+#else
 	if ( use_unix ) {
 		if ( !fork() ) {
 			setpgid(0,getpid());
@@ -511,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 */
@@ -527,9 +559,7 @@ char *control_port_str,*server_port_str;
 		fprintf(stderr,"%s\n",cmd);
 		sleep(20);
 /*		system(cmd); */
-	} else 
-#endif /* VISUAL */
-	{
+	} else {
 		if ( dname )
 			if ( use_ssh )
 			sprintf(cmd,
@@ -543,11 +573,12 @@ 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 */
 }
 
 void Pox_launch(arg,rp)
@@ -1133,3 +1164,25 @@ 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 !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;
+	}
+}