=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.11 retrieving revision 1.30 diff -u -p -r1.11 -r1.30 --- OpenXM_contrib2/asir2000/io/tcpf.c 2000/08/22 05:04:18 1.11 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2001/12/26 09:28:36 1.30 @@ -44,21 +44,24 @@ * 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.10 2000/08/21 08:31:39 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.29 2001/12/25 08:59:49 noro Exp $ */ -#if INET #include "ca.h" #include "parse.h" #include "com.h" #include +#include #if !defined(VISUAL) +#include #include #include #endif #include "ox.h" #if defined(VISUAL) -#include +#include +#include +#include #endif #define OX_XTERM "ox_xterm" @@ -74,15 +77,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(); @@ -90,7 +99,7 @@ int get_mcindex(int); void Pox_send_raw_cmo(), Pox_recv_raw_cmo(); -void Pox_launch(),Pox_launch_nox(),Pox_launch_main(); +void Pox_launch(),Pox_launch_nox(); void Pox_launch_generic(); void Pox_shutdown(); @@ -177,25 +186,21 @@ char *getenv(); #if MPI extern int mpi_myid, mpi_nprocs; -void Pox_mpi_myid(rp) -Q *rp; +void Pox_mpi_myid(Q *rp) { STOQ(mpi_myid,*rp); } -void Pox_mpi_nprocs(rp) -Q *rp; +void Pox_mpi_nprocs(Q *rp) { STOQ(mpi_nprocs,*rp); } #endif -void Pox_get_serverinfo(arg,rp) -NODE arg; -LIST *rp; +void Pox_get_serverinfo(NODE arg,LIST *rp) { int i,c; - Q sid; + Q s_id; NODE t,n0,n; LIST list,l; @@ -204,8 +209,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; @@ -228,9 +233,7 @@ LIST *rp; else use UNIX socket and return a string which represents a path name */ -void Pgenerate_port(arg,rp) -NODE arg; -Obj *rp; +void Pgenerate_port(NODE arg,Obj *rp) { char port_str[BUFSIZ]; int port; @@ -245,7 +248,7 @@ Obj *rp; *rp = (Obj)q; } else { generate_port(1,port_str); - s = (char *)MALLOC(strlen(port_str)+1); + s = (char *)MALLOC(strlen((char *)port_str)+1); strcpy(s,port_str); MKSTR(str,s); *rp = (Obj)str; @@ -256,14 +259,12 @@ Obj *rp; try_bind_listen(port) */ -void Ptry_bind_listen(arg,rp) -NODE arg; -Q *rp; +void Ptry_bind_listen(NODE arg,Q *rp) { char port_str[BUFSIZ]; int port,s,use_unix; - if ( !ARG0(arg) || NUM(ARG0(arg)) ) { + if ( IS_CYGWIN || !ARG0(arg) || NUM(ARG0(arg)) ) { port = QTOS((Q)ARG0(arg)); sprintf(port_str,"%d",port); use_unix = 0; @@ -279,15 +280,13 @@ Q *rp; try_connect(host,port) */ -void Ptry_connect(arg,rp) -NODE arg; -Q *rp; +void Ptry_connect(NODE arg,Q *rp) { char port_str[BUFSIZ]; char *host; int port,s,use_unix; - if ( !ARG1(arg) || NUM(ARG1(arg)) ) { + if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) { port = QTOS((Q)ARG1(arg)); sprintf(port_str,"%d",port); use_unix = 0; @@ -304,13 +303,11 @@ Q *rp; try_accept(sock,port) */ -void Ptry_accept(arg,rp) -NODE arg; -Q *rp; +void Ptry_accept(NODE arg,Q *rp) { int use_unix,s; - if ( !ARG1(arg) || NUM(ARG1(arg)) ) + if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) use_unix = 0; else use_unix = 1; @@ -322,17 +319,16 @@ Q *rp; register_server(cs,cport,ss,sport) */ -void Pregister_server(arg,rp) -NODE arg; -Q *rp; +void Pregister_server(NODE arg,Q *rp) { int cs,ss,cn,sn,ind,use_unix,id; char cport_str[BUFSIZ],sport_str[BUFSIZ]; + Obj obj; MATHCAP server_mathcap; cs = QTOS((Q)ARG0(arg)); ss = QTOS((Q)ARG2(arg)); - if ( !ARG1(arg) || NUM(ARG1(arg)) ) { + if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) { sprintf(cport_str,"%d",QTOS((Q)ARG1(arg))); use_unix = 0; } else { @@ -352,6 +348,13 @@ Q *rp; /* client mode */ cn = get_iofp(cs,cport_str,0); sn = get_iofp(ss,sport_str,0); + /* get_iofp returns -1 if the laucher could not spawn the server */ + if ( sn < 0 ) { + /* we should terminate the launcher */ + ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn); + STOQ(-1,*rp); + return; + } /* register server to the server list */ ind = register_server(use_unix,cn,sn); @@ -361,7 +364,7 @@ Q *rp; ox_send_cmd(sn,SM_mathcap); ox_send_cmd(sn,SM_popCMO); ox_flush_stream_force(sn); - ox_recv(sn,&id,&server_mathcap); + ox_recv(sn,&id,&obj); server_mathcap = (MATHCAP)obj; store_remote_mathcap(sn,server_mathcap); /* send my mathcap */ @@ -386,35 +389,33 @@ Q *rp; conn_to_serv: connect to server if 1 */ -void Pox_launch_generic(arg,rp) -NODE arg; -Q *rp; +void Pox_launch_generic(NODE arg,Q *rp) { int use_unix,use_ssh,use_x,conn_to_serv; char *host,*launcher,*server; + Q ret; host = (arg&&ARG0(arg))?BDY((STRING)ARG0(arg)):0; launcher = BDY((STRING)ARG1(arg)); server = BDY((STRING)ARG2(arg)); - use_unix = ARG3(arg) ? 1 : 0; + use_unix = !IS_CYGWIN && ARG3(arg) ? 1 : 0; use_ssh = ARG4(arg) ? 1 : 0; use_x = ARG5(arg) ? 1 : 0; conn_to_serv = QTOS((Q)ARG6(arg)); - if ( !host ) + if ( !IS_CYGWIN && !host ) use_unix = 1; ox_launch_generic(host,launcher,server, - use_unix,use_ssh,use_x,conn_to_serv,rp); + use_unix,use_ssh,use_x,conn_to_serv,&ret); + *rp = ret; } -void ox_launch_generic(host,launcher,server, - use_unix,use_ssh,use_x,conn_to_serv,rp) -char *host,*launcher,*server; -int use_unix,use_ssh,use_x,conn_to_serv; -Q *rp; +void ox_launch_generic(char *host,char *launcher,char *server, + int use_unix,int use_ssh,int use_x,int conn_to_serv,Q *rp) { int cs,ss,cn,sn,ind,id; char control_port_str[BUFSIZ]; char server_port_str[BUFSIZ]; + Obj obj; MATHCAP server_mathcap; control_port_str[0] = 0; @@ -441,6 +442,13 @@ Q *rp; /* client mode */ cn = get_iofp(cs,control_port_str,0); sn = get_iofp(ss,server_port_str,0); + /* get_iofp returns -1 if the laucher could not spawn the server */ + if ( sn < 0 ) { + /* we should terminate the launcher */ + ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn); + STOQ(-1,*rp); + return; + } /* register server to the server list */ ind = register_server(use_unix,cn,sn); @@ -450,7 +458,7 @@ Q *rp; ox_send_cmd(sn,SM_mathcap); ox_send_cmd(sn,SM_popCMO); ox_flush_stream_force(sn); - ox_recv(sn,&id,&server_mathcap); + ox_recv(sn,&id,&obj); server_mathcap = (MATHCAP)obj; store_remote_mathcap(sn,server_mathcap); /* send my mathcap */ @@ -462,38 +470,162 @@ Q *rp; STOQ(ind,*rp); } -int spawn_server(host,launcher,server, - use_unix,use_ssh,use_x,conn_to_serv, - control_port_str,server_port_str) -char *host,*launcher,*server; -int use_unix,use_ssh,use_x,conn_to_serv; -char *control_port_str,*server_port_str; +#if defined(__CYGWIN__) +static void bslash2slash(char *buf) { - char cmd[BUFSIZ]; + char *p; + + for ( p = buf; *p; p++ ) + if ( *p == '\\' ) + *p = '/'; +} + +static int get_start_path(char *buf) +{ + static char start_path[BUFSIZ]; + static int start_initialized = 0; + char name[BUFSIZ]; + + if ( start_initialized ) { + strcpy(buf,start_path); + return 1; + } + + /* Windows2000 */ + strcpy(buf,"c:\\winnt\\system32\\start.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + strcpy(start_path,buf); + return 1; + } + + /* Windows98 */ + strcpy(buf,"c:\\windows\\command\\start.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + strcpy(start_path,buf); + return 1; + } + + return 0; +} + +static void get_launcher_path(char *buf) +{ + static char rootname[BUFSIZ]; + static char launcher_path[BUFSIZ]; + static int launcher_initialized = 0; + char name[BUFSIZ]; + + if ( launcher_initialized ) { + strcpy(buf,launcher_path); + return; + } + + get_rootdir(rootname,sizeof(rootname)); + sprintf(name,"%s/ox_launch.exe",rootname); + cygwin_conv_to_full_win32_path(name,launcher_path); + bslash2slash(launcher_path); + launcher_initialized = 1; + strcpy(buf,launcher_path); +} +#endif + +void spawn_server(char *host,char *launcher,char *server, + int use_unix,int use_ssh,int use_x,int conn_to_serv, + char *control_port_str,char *server_port_str) +{ char localhost[BUFSIZ]; - char *dname,*conn_str,*rsh; + char *dname,*conn_str,*rsh,*dname0; + char AsirExe[BUFSIZ]; + STRING rootdir; + char prog[BUFSIZ]; + char *av[BUFSIZ]; +#if !defined(VISUAL) + char cmd[BUFSIZ]; +#endif +#if defined(__CYGWIN__) + char win_start[BUFSIZ],win_launcher[BUFSIZ]; +#endif + void Pget_rootdir(); - 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 = use_ssh ? "ssh" : RSH; + rsh = getenv("ASIR_RSH"); + if ( !rsh ) + rsh = use_ssh ? "ssh" : RSH; + if ( !use_unix && strstr(rsh,"ssh") ) { + /* + * if "ssh" is used to invoke a remote server, + * we should not specify "-display". + */ + use_ssh = 1; + } gethostname(localhost,BUFSIZ); -#if !defined(VISUAL) - if ( use_unix ) { +#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 || !host ) { +#if defined(__CYGWIN__) + get_launcher_path(win_launcher); + if ( dname && strchr(dname,':') ) { + if ( !fork() ) { + setpgid(0,getpid()); + execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, + "-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname,0); + } + } else if ( dname && get_start_path(win_start) ) { + sprintf(cmd,"%s %s %s %s %s %s %s 1", + win_start,win_launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server); + system(cmd); + } else { + if ( !fork() ) { + setpgid(0,getpid()); + execlp(launcher,launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname0,"-nolog",0); + } + } +#else if ( !fork() ) { setpgid(0,getpid()); if ( dname ) - execlp("xterm","xterm","-name",OX_XTERM,"-display",dname, - "-geometry","60x10","-e",launcher,".",conn_str, + execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, + "-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_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); + else + execlp(launcher,launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname0,"-nolog",0); } +#endif } else if ( conn_to_serv == 2 ) { /* special support for java */ if ( dname ) sprintf(cmd, - "%s -n %s \"(cd %s; xterm -name %s -display %s -geometry 60x10 -e java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null", + "%s -n %s \"(cd %s; xterm -name %s %s -geometry 60x10 -e java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null", rsh,host,launcher,OX_XTERM,dname,server,localhost,control_port_str,server_port_str); else sprintf(cmd, @@ -503,35 +635,42 @@ char *control_port_str,*server_port_str; fprintf(stderr,"%s\n",cmd); sleep(20); /* system(cmd); */ - } else -#endif /* VISUAL */ - { + } else { if ( dname ) - sprintf(cmd, - "%s -n %s \"xterm -name %s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null&\">/dev/null", - rsh,host,OX_XTERM,dname,launcher,localhost,conn_str, + 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", + 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", + 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) -NODE arg; -Obj *rp; +void Pox_launch(NODE arg,Obj *rp) { - Pox_launch_main(1,arg,rp); + ox_launch_main(1,arg,rp); } -void Pox_launch_nox(arg,rp) -NODE arg; -Obj *rp; +void Pox_launch_nox(NODE arg,Obj *rp) { - Pox_launch_main(0,arg,rp); + ox_launch_main(0,arg,rp); } /* @@ -540,15 +679,13 @@ Obj *rp; ox_launch(remote,lib,ox_xxx) : invoke remote ox_xxx with lib/ox_launch */ -void Pox_launch_main(with_x,arg,rp) -int with_x; -NODE arg; -Obj *rp; +void ox_launch_main(int with_x,NODE arg,Obj *p) { char *str; - char *hostname,*servername,*dname; + char *hostname,*servername; char *control; int use_unix; + Q ret; extern char *asir_libdir; if ( arg && ARG0(arg) && argc(arg) != 3 ) @@ -556,12 +693,12 @@ Obj *rp; control = (char *)MALLOC(BUFSIZ); if ( !arg || ( !ARG0(arg) && argc(arg) == 1 ) ) { sprintf(control,"%s/ox_launch",asir_libdir); - use_unix = 1; + use_unix = IS_CYGWIN ? 0 : 1; servername = (char *)MALLOC(BUFSIZ); sprintf(servername,"%s/ox_asir",asir_libdir); } else if ( !ARG0(arg) && argc(arg) == 2 ) { sprintf(control,"%s/ox_launch",asir_libdir); - use_unix = 1; + use_unix = IS_CYGWIN ? 0 : 1; str = BDY((STRING)ARG1(arg)); if ( str[0] == '/' ) servername = str; @@ -572,7 +709,7 @@ Obj *rp; } else { sprintf(control,"%s/ox_launch",BDY((STRING)ARG1(arg))); if ( !ARG0(arg) ) - use_unix = 1; + use_unix = IS_CYGWIN ? 0 : 1; else use_unix = 0; str = BDY((STRING)ARG2(arg)); @@ -587,13 +724,13 @@ Obj *rp; hostname = BDY((STRING)ARG0(arg)); else hostname = 0; - ox_launch_generic(hostname,control,servername,use_unix,0,with_x,0,rp); + ox_launch_generic(hostname,control,servername,use_unix,0,with_x,0,&ret); + *p = (Obj)ret; } -int register_server(af_unix,m,c) -int af_unix,m,c; +int register_server(int af_unix,int m,int c) { - int s,i,ci; + int s,i; struct m_c *t; #define INIT_TAB_SIZ 64 @@ -620,8 +757,8 @@ int af_unix,m,c; #endif if ( m_c_i == m_c_s ) { s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c); - t = (struct m_c *)MALLOC_ATOMIC(s); bzero(m_c_tab,s); - bcopy(m_c_tab,t,m_c_s*sizeof(struct m_c)); + t = (struct m_c *)MALLOC_ATOMIC(s); bzero((void *)m_c_tab,s); + bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c)); for ( i = 0; i < INIT_TAB_SIZ; i++ ) { m_c_tab[m_c_s+i].af_unix = 0; m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; @@ -635,8 +772,7 @@ int af_unix,m,c; /* iofp index => m_c_tab index */ -int get_mcindex(i) -int i; +int get_mcindex(int i) { int j; @@ -648,9 +784,7 @@ int i; /* arg = [ind0,ind1,...]; indk = index to m_c_tab */ -void Pox_select(arg,rp) -NODE arg; -LIST *rp; +void Pox_select(NODE arg,LIST *rp) { int fd,n,i,index,mcind; fd_set r,w,e; @@ -673,7 +807,7 @@ LIST *rp; for ( t = list; t; t = NEXT(t) ) { index = QTOS((Q)BDY(t)); valid_mctab_index(index); - fd = get_fd(m_c_tab[index].c); FD_SET(fd,&r); + fd = get_fd(m_c_tab[index].c); FD_SET((unsigned int)fd,&r); } n = select(FD_SETSIZE,&r,&w,&e,tvp); for ( i = 0, t = 0; n && i < FD_SETSIZE; i++ ) @@ -687,9 +821,7 @@ LIST *rp; MKLIST(*rp,t); } -void Pox_flush(arg,rp) -NODE arg; -Q *rp; +void Pox_flush(NODE arg,Q *rp) { int index = QTOS((Q)ARG0(arg)); @@ -698,9 +830,7 @@ Q *rp; *rp = ONE; } -void Pox_send_raw_cmo(arg,rp) -NODE arg; -Obj *rp; +void Pox_send_raw_cmo(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -713,9 +843,7 @@ Obj *rp; *rp = 0; } -void Pox_recv_raw_cmo(arg,rp) -NODE arg; -Obj *rp; +void Pox_recv_raw_cmo(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -725,9 +853,7 @@ Obj *rp; ox_read_cmo(s,rp); } -void Pox_push_local(arg,rp) -NODE arg; -Obj *rp; +void Pox_push_local(NODE arg,Obj *rp) { int s; struct oLIST dummy; @@ -746,9 +872,7 @@ Obj *rp; *rp = 0; } -void Pox_push_cmo(arg,rp) -NODE arg; -Obj *rp; +void Pox_push_cmo(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -760,11 +884,8 @@ Obj *rp; *rp = 0; } -void Pox_push_vl(arg,rp) -NODE arg; -Obj *rp; +void Pox_push_vl(NODE arg,Obj *rp) { - int s; int index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); @@ -772,9 +893,7 @@ Obj *rp; *rp = 0; } -void Pox_pop_local(arg,rp) -NODE arg; -Obj *rp; +void Pox_pop_local(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -786,9 +905,7 @@ Obj *rp; ox_get_result(s,rp); } -void Pox_pop_cmo(arg,rp) -NODE arg; -Obj *rp; +void Pox_pop_cmo(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -800,9 +917,7 @@ Obj *rp; ox_get_result(s,rp); } -void Pox_pop0_local(arg,rp) -NODE arg; -Obj *rp; +void Pox_pop0_local(NODE arg,Obj *rp) { int index = QTOS((Q)ARG0(arg)); @@ -811,9 +926,7 @@ Obj *rp; *rp = 0; } -void Pox_pop0_cmo(arg,rp) -NODE arg; -Obj *rp; +void Pox_pop0_cmo(NODE arg,Obj *rp) { int index = QTOS((Q)ARG0(arg)); @@ -822,9 +935,7 @@ Obj *rp; *rp = 0; } -void Pox_pop0_string(arg,rp) -NODE arg; -STRING *rp; +void Pox_pop0_string(NODE arg,STRING *rp) { int index = QTOS((Q)ARG0(arg)); @@ -833,11 +944,9 @@ STRING *rp; *rp = 0; } -void Pox_pop_string(arg,rp) -NODE arg; -STRING *rp; +void Pox_pop_string(NODE arg,Obj *rp) { - int s,id; + int s; int index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); @@ -847,9 +956,7 @@ STRING *rp; ox_get_result(s,rp); } -void Pox_get(arg,rp) -NODE arg; -Obj *rp; +void Pox_get(NODE arg,Obj *rp) { int index; int s; @@ -867,9 +974,7 @@ Obj *rp; } } -void Pox_pops(arg,rp) -NODE arg; -Obj *rp; +void Pox_pops(NODE arg,Obj *rp) { int s; USINT n; @@ -886,9 +991,7 @@ Obj *rp; *rp = 0; } -void Pox_execute_function(arg,rp) -NODE arg; -Obj *rp; +void Pox_execute_function(NODE arg,Obj *rp) { int s; USINT ui; @@ -903,9 +1006,7 @@ Obj *rp; *rp = 0; } -void Pox_setname(arg,rp) -NODE arg; -Obj *rp; +void Pox_setname(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -917,9 +1018,7 @@ Obj *rp; *rp = 0; } -void Pox_evalname(arg,rp) -NODE arg; -Obj *rp; +void Pox_evalname(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -931,9 +1030,7 @@ Obj *rp; *rp = 0; } -void Pox_execute_string(arg,rp) -NODE arg; -Obj *rp; +void Pox_execute_string(NODE arg,Obj *rp) { int s; int index = QTOS((Q)ARG0(arg)); @@ -947,9 +1044,7 @@ Obj *rp; /* arg=[sid,fname,arg0,arg1,...,arg{n-1}] */ -void Pox_rpc(arg,rp) -NODE arg; -Obj *rp; +void Pox_rpc(NODE arg,Obj *rp) { int s,i,n; STRING f; @@ -975,9 +1070,7 @@ Obj *rp; *rp = 0; } -void Pox_cmo_rpc(arg,rp) -NODE arg; -Obj *rp; +void Pox_cmo_rpc(NODE arg,Obj *rp) { int s,i,n; STRING f; @@ -1002,12 +1095,10 @@ Obj *rp; *rp = 0; } -void Pox_reset(arg,rp) -NODE arg; -Q *rp; +void Pox_reset(NODE arg,Q *rp) { USINT t; - int s,id,c,m; + int id,c,m; Obj obj; int index = QTOS((Q)ARG0(arg)); @@ -1018,7 +1109,7 @@ Q *rp; if ( argc(arg) == 1 ) { ox_send_cmd(m,SM_control_reset_connection); ox_flush_stream_force(m); - ox_recv(m,&id,&t); + ox_recv(m,&id,&obj); t = (USINT)obj; } *rp = ONE; #if defined(VISUAL) @@ -1036,12 +1127,9 @@ Q *rp; *rp = 0; } -void Pox_intr(arg,rp) -NODE arg; -Q *rp; +void Pox_intr(NODE arg,Q *rp) { int m; - Obj obj; int index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); @@ -1056,9 +1144,7 @@ Q *rp; *rp = 0; } -void Pox_sync(arg,rp) -NODE arg; -Q *rp; +void Pox_sync(NODE arg,Q *rp) { int c; int index = QTOS((Q)ARG0(arg)); @@ -1069,18 +1155,22 @@ Q *rp; *rp = 0; } -void Pox_shutdown(arg,rp) -NODE arg; -Q *rp; +void Pox_shutdown(NODE arg,Q *rp) { int s; int index = QTOS((Q)ARG0(arg)); +#if !defined(VISUAL) int status; +#endif valid_mctab_index(index); 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); @@ -1090,9 +1180,7 @@ Q *rp; *rp = 0; } -void Pox_push_cmd(arg,rp) -NODE arg; -Q *rp; +void Pox_push_cmd(NODE arg,Q *rp) { int ui; int index = QTOS((Q)ARG0(arg)); @@ -1102,4 +1190,34 @@ Q *rp; ox_send_cmd(m_c_tab[index].c,ui); *rp = 0; } + +void shutdown_all() { + int s; + int i,index; +#if !defined(VISUAL) + int status; #endif + + 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; + } +}