=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.19 retrieving revision 1.53 diff -u -p -r1.19 -r1.53 --- OpenXM_contrib2/asir2000/io/tcpf.c 2000/11/15 01:20:27 1.19 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2004/03/09 07:18:26 1.53 @@ -44,14 +44,15 @@ * 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.18 2000/11/13 03:36:03 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.52 2004/03/09 05:33:10 noro Exp $ */ -#if INET #include "ca.h" #include "parse.h" #include "com.h" #include +#include #if !defined(VISUAL) +#include #include #include #endif @@ -78,7 +79,9 @@ static struct m_c { static int m_c_i,m_c_s; int I_am_server; -#if MPI +extern int little_endian; + +#if defined(MPI) extern int mpi_nprocs; #define valid_mctab_index(ind)\ if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");} @@ -93,12 +96,18 @@ if((ind)<0||(ind)>=m_c_i||\ ((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){(ind)=-1;} #endif +struct IOFP iofp_102[MAXIOFP]; +int nserver_102; +int myrank_102; + +int register_102(int s,int rank, int is_master); + int register_server(); 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(); @@ -118,6 +127,14 @@ void Pgenerate_port(),Ptry_bind_listen(),Ptry_connect( void Pregister_server(); void Pox_get_serverinfo(); void Pox_mpi_myid(), Pox_mpi_nprocs(); +void Pnd_exec_f4_red(); +void Pox_tcp_accept_102(),Pox_tcp_connect_102(); +void Pox_send_102(),Pox_recv_102(); +void Pox_set_rank_102(); +void Pox_get_rank_102(); +void Pox_reset_102(); +void Pox_bcast_102(); +void Pox_reduce_102(); void ox_launch_generic(); @@ -128,6 +145,19 @@ struct ftab tcp_tab[] = { {"ox_recv_raw_cmo",Pox_recv_raw_cmo,1}, {"ox_get_serverinfo",Pox_get_serverinfo,-1}, {"generate_port",Pgenerate_port,-1}, + + /* from master to client */ + {"ox_set_rank_102",Pox_set_rank_102,3}, + {"ox_tcp_accept_102",Pox_tcp_accept_102,3}, + {"ox_tcp_connect_102",Pox_tcp_connect_102,4}, + {"ox_reset_102",Pox_reset_102,1}, + + {"ox_get_rank_102",Pox_get_rank_102,0}, + {"ox_send_102",Pox_send_102,2}, + {"ox_recv_102",Pox_recv_102,1}, + {"ox_bcast_102",Pox_bcast_102,-2}, + {"ox_reduce_102",Pox_reduce_102,-3}, + {"try_bind_listen",Ptry_bind_listen,1}, {"try_connect",Ptry_connect,2}, {"try_accept",Ptry_accept,2}, @@ -142,11 +172,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}, @@ -172,7 +202,9 @@ struct ftab tcp_tab[] = { {"ox_execute_string",Pox_execute_string,2}, {"ox_execute_function",Pox_execute_function,3}, + {"nd_exec_f4_red",Pnd_exec_f4_red,0}, + {0,0,0}, }; @@ -182,38 +214,40 @@ extern int ox_exchange_mathcap; char *getenv(); -#if MPI +void Pnd_exec_f4_red(Q *rp) +{ + nd_exec_f4_red_dist(); + *rp = 0; +} + +#if defined(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; 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); - 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; @@ -236,9 +270,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; @@ -253,25 +285,100 @@ 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; } } +void Pox_reset_102(NODE arg,Q *rp) +{ + int s; + int index = QTOS((Q)ARG0(arg)); + + valid_mctab_index(index); + s = m_c_tab[index].c; + ox_send_cmd(s,SM_reset_102); + ox_flush_stream_force(s); + *rp = 0; +} + +void Pox_get_rank_102(LIST *rp) +{ + Q n,r; + NODE node; + + STOQ(nserver_102,n); + STOQ(myrank_102,r); + node = mknode(2,n,r); + MKLIST(*rp,node); +} + +void Pox_set_rank_102(NODE arg,Q *rp) +{ + Q nserver,rank; + int s; + int index = QTOS((Q)ARG0(arg)); + + valid_mctab_index(index); + s = m_c_tab[index].c; + nserver = (Q)ARG1(arg); + rank = (Q)ARG2(arg); + ox_send_data(s,nserver); + ox_send_data(s,rank); + ox_send_cmd(s,SM_set_rank_102); + ox_flush_stream_force(s); + *rp = 0; +} + +/* ox_tcp_accept_102(server,port,rank) */ + +void Pox_tcp_accept_102(NODE arg,Q *rp) +{ + int s; + int index = QTOS((Q)ARG0(arg)); + + valid_mctab_index(index); + s = m_c_tab[index].c; + + ox_send_data(s,ARG1(arg)); + ox_send_data(s,ARG2(arg)); + ox_send_cmd(s,SM_tcp_accept_102); + ox_flush_stream_force(s); + *rp = 0; +} + /* + ox_tcp_connect_102(server,host,port,rank) +*/ + +void Pox_tcp_connect_102(NODE arg,Q *rp) +{ + int s; + int index = QTOS((Q)ARG0(arg)); + + valid_mctab_index(index); + s = m_c_tab[index].c; + + ox_send_data(s,ARG1(arg)); + ox_send_data(s,ARG2(arg)); + ox_send_data(s,ARG3(arg)); + ox_send_cmd(s,SM_tcp_connect_102); + ox_flush_stream_force(s); + *rp = 0; +} + +/* 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; @@ -287,15 +394,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; @@ -312,13 +417,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; @@ -330,17 +433,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 { @@ -376,7 +478,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 */ @@ -401,35 +503,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; @@ -439,17 +539,23 @@ Q *rp; 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 ); @@ -472,7 +578,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 */ @@ -484,36 +590,129 @@ 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; + } + + /* 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); + start_initialized = 1; + 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); + start_initialized = 1; + return 1; + } + + strcpy(buf,"c:\\winnt\\system32\\cmd.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + sprintf(start_path,"%s /c start",buf); + strcpy(buf,start_path); + start_initialized = 1; + return 1; + } + + strcpy(buf,"c:\\windows\\system32\\cmd.exe"); + cygwin_conv_to_full_posix_path(buf,name); + if ( !access(name,X_OK) ) { + bslash2slash(buf); + sprintf(start_path,"%s /c start",buf); + strcpy(buf,start_path); + start_initialized = 1; + 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,*dname0; - char dname_str[BUFSIZ]; + char *dname,*conn_str,*rsh,*dname0,*asirhost; 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(); 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". */ use_ssh = 1; } - gethostname(localhost,BUFSIZ); + asirhost = (char *)getenv("ASIRHOSTNAME"); + if ( asirhost ) + strcpy(localhost,asirhost); + else + gethostname(localhost,BUFSIZ); #if defined(VISUAL) if ( !use_unix ) error("spawn_server : not implemented on Windows"); @@ -534,17 +733,40 @@ char *control_port_str,*server_port_str; // _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 ( 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","-xrm","XTerm*locale:false","-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,"-T","ox_launch:local","-display",dname, - "-geometry","60x10","-e",launcher,".",conn_str, + "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str, control_port_str,server_port_str,server,dname,0); - else - execlp(launcher,launcher,".",conn_str, + 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 ) @@ -562,17 +784,23 @@ char *control_port_str,*server_port_str; } 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 -xrm 'XTerm*locale:false' -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 -xrm 'XTerm*locale:false' -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, + 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,"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"); @@ -581,18 +809,14 @@ char *control_port_str,*server_port_str; #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); } /* @@ -601,15 +825,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 ) @@ -617,12 +839,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; @@ -633,7 +855,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)); @@ -648,13 +870,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 @@ -669,7 +891,7 @@ int af_unix,m,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; @@ -681,8 +903,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; @@ -696,8 +918,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; @@ -709,9 +930,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; @@ -734,7 +953,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++ ) @@ -748,9 +967,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)); @@ -759,9 +976,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)); @@ -774,9 +989,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)); @@ -786,15 +999,66 @@ Obj *rp; ox_read_cmo(s,rp); } -void Pox_push_local(arg,rp) -NODE arg; -Obj *rp; +void Pox_send_102(NODE arg,Obj *rp) { + int rank = QTOS((Q)ARG0(arg)); + + ox_send_data_102(rank,(Obj)ARG1(arg)); + *rp = 0; +} + +void Pox_recv_102(NODE arg,Obj *rp) +{ + int id; + int rank = QTOS((Q)ARG0(arg)); + + ox_recv_102(rank,&id,rp); +} + +void Pox_bcast_102(NODE arg,Obj *rp) +{ + int rank = QTOS((Q)ARG0(arg)); + Obj data; + + if ( argc(arg) > 1 ) + asir_push_one((Obj)ARG1(arg)); + ox_bcast_102(rank); + *rp = (Obj)asir_pop_one(); +} + +void Pox_reduce_102(NODE arg,Obj *rp) +{ + int root = QTOS((Q)ARG0(arg)); + STRING op; + char *opname; + void (*func)(); + + op = (STRING)ARG1(arg); + asir_assert(op,O_STR,"ox_reduce_102"); + opname = BDY(op); + if ( !strcmp(opname,"+") ) + func = arf_add; + else if ( !strcmp(opname,"*") ) + func = arf_mul; + else { + error("ox_reduce_102 : operation not supported"); + } + if ( argc(arg) > 2 ) + asir_push_one((Obj)ARG2(arg)); + ox_reduce_102(root,func); + *rp = (Obj)asir_pop_one(); +} + +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); @@ -807,13 +1071,14 @@ 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)); + 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) ) @@ -821,11 +1086,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); @@ -833,9 +1095,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)); @@ -847,9 +1107,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)); @@ -861,9 +1119,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)); @@ -872,9 +1128,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)); @@ -883,9 +1137,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)); @@ -894,11 +1146,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); @@ -908,9 +1158,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; @@ -928,9 +1176,7 @@ Obj *rp; } } -void Pox_pops(arg,rp) -NODE arg; -Obj *rp; +void Pox_pops(NODE arg,Obj *rp) { int s; USINT n; @@ -947,9 +1193,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; @@ -964,9 +1208,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)); @@ -978,9 +1220,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)); @@ -992,13 +1232,12 @@ 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)); + asir_assert(ARG1(arg),O_STR,"ox_execute_string"); valid_mctab_index(index); s = m_c_tab[index].c; ox_send_data(s,ARG1(arg)); @@ -1008,9 +1247,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; @@ -1036,9 +1273,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; @@ -1063,12 +1298,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)); @@ -1079,7 +1312,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) @@ -1097,12 +1330,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); @@ -1117,9 +1347,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)); @@ -1130,23 +1358,21 @@ 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 !defined(MPI) && !defined(VISUAL) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1155,9 +1381,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)); @@ -1167,12 +1391,13 @@ Q *rp; ox_send_cmd(m_c_tab[index].c,ui); *rp = 0; } -#endif 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; @@ -1181,12 +1406,13 @@ void shutdown_all() { 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 !defined(MPI) && !defined(VISUAL) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1194,3 +1420,92 @@ void shutdown_all() { m_c_tab[index].af_unix = 0; } } + +char *ox_get_servername(int); + +int is_ox_plot(int index) +{ + char *name; + + check_valid_mctab_index(index); + if ( index < 0 ) + return 0; + /* m : client, c : server ??? */ + name = ox_get_servername(m_c_tab[index].c); + return strcmp(name,"ox_plot") ? 0 : 1; +} + +int validate_ox_plot_stream(int index) +{ + int i; + NODE arg; + STRING name; + Obj r; + + if ( is_ox_plot(index) ) + return index; + for ( i = 0; i < m_c_i; i++ ) + if ( is_ox_plot(i) ) + return i; + + /* create an ox_plot server */ + MKSTR(name,"ox_plot"); + arg = mknode(2,0,name); + Pox_launch_nox(arg,&r); + i = QTOS((Q)r); +#if defined(VISUAL) + Sleep(100); + ox_send_cmd(m_c_tab[i].c,SM_nop); + ox_flush_stream_force(m_c_tab[i].c); +#endif + return i; +} + +int get_ox_server_id(int index) +{ + valid_mctab_index(index); + return m_c_tab[index].c; +} + +int register_102(int s1,int rank,int is_master) +{ + unsigned char c,rc; + + if ( rank >= MAXIOFP ) return -1; + iofp_102[rank].s = s1; +#if defined(VISUAL) + iofp_102[rank].in = WSIO_open(s1,"r"); + iofp_102[rank].out = WSIO_open(s1,"w"); +#else + iofp_102[rank].in = fdopen(s1,"r"); + iofp_102[rank].out = fdopen(s1,"w"); +#if !defined(__CYGWIN__) + setbuffer(iofp_102[rank].in,iofp_102[rank].inbuf = + (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = + (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); +#endif +#endif + if ( little_endian ) + c = 1; + else + c = 0xff; + if ( is_master ) { + /* server : write -> read */ + write_char((FILE *)iofp_102[rank].out,&c); + ox_flush_stream_force_102(rank); + read_char((FILE *)iofp_102[rank].in,&rc); + } else { + /* client : read -> write */ + read_char((FILE *)iofp_102[rank].in,&rc); + /* special care for a failure of spawing a server */ + if ( rc !=0 && rc != 1 && rc != 0xff ) + return -1; + write_char((FILE *)iofp_102[rank].out,&c); + ox_flush_stream_force_102(rank); + } + iofp_102[rank].conv = c == rc ? 0 : 1; + iofp_102[rank].socket = 0; + return 0; +} +