=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.13 retrieving revision 1.25 diff -u -p -r1.13 -r1.25 --- OpenXM_contrib2/asir2000/io/tcpf.c 2000/09/25 04:33:37 1.13 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2001/06/06 02:21:40 1.25 @@ -44,9 +44,8 @@ * 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.12 2000/09/23 00:57:44 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.24 2001/06/04 02:49:47 noro Exp $ */ -#if INET #include "ca.h" #include "parse.h" #include "com.h" @@ -58,7 +57,9 @@ #include "ox.h" #if defined(VISUAL) -#include +#include +#include +#include #endif #define OX_XTERM "ox_xterm" @@ -74,15 +75,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(); @@ -195,7 +202,7 @@ NODE arg; LIST *rp; { int i,c; - Q sid; + Q s_id; NODE t,n0,n; LIST list,l; @@ -204,8 +211,8 @@ LIST *rp; if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) { c = m_c_tab[i].c; ox_get_serverinfo(c,&list); - STOQ(i,sid); - t = mknode(2,sid,list); + STOQ(i,s_id); + t = mknode(2,s_id,list); MKLIST(l,t); NEXTNODE(n0,n); BDY(n) = (pointer)l; @@ -485,15 +492,22 @@ 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"); + if ( !dname0 ) + dname0 = "0"; + dname = use_x ? dname0 : 0; conn_str = conn_to_serv ? "1" : "0"; rsh = getenv("ASIR_RSH"); if ( !rsh ) rsh = use_ssh ? "ssh" : RSH; - if ( !use_unix && dname && strstr(rsh,"ssh") ) { + if ( !use_unix && strstr(rsh,"ssh") ) { /* * if "ssh" is used to invoke a remote server, * we should not specify "-display". @@ -501,7 +515,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 +544,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,27 +560,32 @@ 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, -"%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null\">/dev/null", + sprintf(cmd, +"%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null\">/dev/null", rsh,host,OX_XTERM,host,launcher,localhost,conn_str, control_port_str,server_port_str,server,"1"); else - sprintf(cmd, -"%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null&\">/dev/null", + sprintf(cmd, +"%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null&\">/dev/null", rsh,host,OX_XTERM,host,dname,launcher,localhost,conn_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", + if ( use_ssh ) + sprintf(cmd, +"%s -f -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,"1","-nolog"); + else + sprintf(cmd, +"%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,dname0,"-nolog"); system(cmd); } +#endif /* VISUAL */ } void Pox_launch(arg,rp) @@ -1111,6 +1149,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); @@ -1132,4 +1174,32 @@ Q *rp; ox_send_cmd(m_c_tab[index].c,ui); *rp = 0; } + +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); +#if defined(VISUAL) + Sleep(1000); #endif + 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; + } +}