=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.30 retrieving revision 1.67 diff -u -p -r1.30 -r1.67 --- OpenXM_contrib2/asir2000/io/tcpf.c 2001/12/26 09:28:36 1.30 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2015/08/05 16:01:20 1.67 @@ -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.29 2001/12/25 08:59:49 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.66 2013/11/22 00:43:41 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -58,12 +58,13 @@ #endif #include "ox.h" -#if defined(VISUAL) #include +#if defined(VISUAL) #include #include #endif +#define INIT_TAB_SIZ 64 #define OX_XTERM "ox_xterm" #if !defined(_PA_RISC1_1) @@ -79,7 +80,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");} @@ -87,13 +90,19 @@ if((ind)<0||(ind)>=mpi_nprocs){error("invalid server i if((ind)<0||(ind)>=mpi_nprocs){(ind)=-1;} #else #define valid_mctab_index(ind)\ -if((ind)<0||(ind)>=m_c_i||\ +if((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||\ +if((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); @@ -119,6 +128,13 @@ void Pgenerate_port(),Ptry_bind_listen(),Ptry_connect( void Pregister_server(); void Pox_get_serverinfo(); void Pox_mpi_myid(), Pox_mpi_nprocs(); +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(); @@ -129,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}, @@ -143,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}, @@ -173,7 +202,6 @@ struct ftab tcp_tab[] = { {"ox_execute_string",Pox_execute_string,2}, {"ox_execute_function",Pox_execute_function,3}, - {0,0,0}, }; @@ -181,9 +209,10 @@ extern struct IOFP iofp[]; extern MATHCAP my_mathcap; extern int ox_exchange_mathcap; -char *getenv(); +Obj asir_pop_one(); +void asir_push_one(Obj); -#if MPI +#if defined(MPI) extern int mpi_myid, mpi_nprocs; void Pox_mpi_myid(Q *rp) @@ -205,7 +234,7 @@ void Pox_get_serverinfo(NODE arg,LIST *rp) 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); @@ -255,7 +284,84 @@ void Pgenerate_port(NODE arg,Obj *rp) } } +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) */ @@ -357,7 +463,7 @@ void Pregister_server(NODE arg,Q *rp) } /* register server to the server list */ - ind = register_server(use_unix,cn,sn); + ind = register_server(use_unix,cn,sn,-1); if ( ox_exchange_mathcap ) { /* request remote mathcap */ @@ -376,6 +482,49 @@ void Pregister_server(NODE arg,Q *rp) STOQ(ind,*rp); } +#if !defined(VISUAL) +#include +#include +#include +#include + +static int find_executable(char *); +static int find_executable_main(char *); + +static int find_executable(char *com) +{ + char *c,*s; + int len; + char dir[BUFSIZ],path[BUFSIZ]; + + for ( s = (char *)getenv("PATH"); s; ) { + c = (char *)index(s,':'); + if ( c ) { + len = c-s; + strncpy(dir,s,len); s = c+1; dir[len] = 0; + } else { + strcpy(dir,s); s = 0; + } + sprintf(path,"%s/%s",dir,com); + if ( find_executable_main(path) ) + return 1; + } + return 0; +} + +static int find_executable_main(char *file) +{ + struct stat buf; + + if ( stat(file,&buf) || (buf.st_mode & S_IFDIR) ) + return 0; + if ( access(file,X_OK) ) + return 0; + else + return 1; +} + +#endif /* ox_launch_generic(host,launcher,server,use_unix,use_ssh,use_x,conn_to_serv) @@ -409,6 +558,45 @@ void Pox_launch_generic(NODE arg,Q *rp) *rp = ret; } +#if 0 +void ox_launcher_101_generic(char *host,char *launcher, + int use_unix,int use_ssh,int use_x,int conn_to_serv,Q *rp) +{ + int cs,cn,ind,id; + char control_port_str[BUFSIZ]; + Obj obj; + +#if !defined(VISUAL) + if ( use_unix && !find_executable("xterm") ) use_x = 0; +#endif + control_port_str[0] = 0; + do { + generate_port(use_unix,control_port_str); + if ( conn_to_serv ) { + spawn_server_101(host,launcher, + use_unix,use_ssh,use_x,conn_to_serv, + control_port_str); + cs = try_connect(use_unix,host,control_port_str); + } else { + cs = try_bind_listen(use_unix,control_port_str); + if ( cs < 0 ) continue; + spawn_laucher_101(host,launcher, + use_unix,use_ssh,use_x,conn_to_serv, + control_port_str); + cs = try_accept(use_unix,cs); + } + } while ( cs < 0 ); + + /* client mode */ + cn = get_iofp(cs,control_port_str,0); + + /* register server to the server list */ + ind = register_server_101(use_unix,cn); + + STOQ(ind,*rp); +} +#endif + 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) { @@ -417,7 +605,29 @@ void ox_launch_generic(char *host,char *launcher,char char server_port_str[BUFSIZ]; Obj obj; MATHCAP server_mathcap; + Q value; + char *key; + int fd=-1; + NODE opt,n0; + if ( current_option ) { + for ( opt = current_option; opt; opt = NEXT(opt) ) { + n0 = BDY((LIST)BDY(opt)); + key = BDY((STRING)BDY(n0)); + value = (Q)BDY(NEXT(n0)); + if ( !strcmp(key,"fd") && value ) { + fd = QTOS(value); + break; + } + } + } + if (!available_mcindex(fd)) { + STOQ(-1,*rp); + return; + } +#if !defined(VISUAL) + if ( use_unix && !find_executable("xterm") ) use_x = 0; +#endif control_port_str[0] = 0; server_port_str[0] = 0; do { @@ -425,17 +635,23 @@ void ox_launch_generic(char *host,char *launcher,char 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 ); @@ -451,7 +667,7 @@ void ox_launch_generic(char *host,char *launcher,char } /* register server to the server list */ - ind = register_server(use_unix,cn,sn); + ind = register_server(use_unix,cn,sn,fd); if ( ox_exchange_mathcap ) { /* request remote mathcap */ @@ -470,7 +686,7 @@ void ox_launch_generic(char *host,char *launcher,char STOQ(ind,*rp); } -#if defined(__CYGWIN__) +#if defined(__CYGWIN32__) static void bslash2slash(char *buf) { char *p; @@ -491,24 +707,46 @@ static int get_start_path(char *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); + 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; } - /* Windows98 */ - strcpy(buf,"c:\\windows\\command\\start.exe"); + strcpy(buf,"c:\\winnt\\system32\\cmd.exe"); cygwin_conv_to_full_posix_path(buf,name); if ( !access(name,X_OK) ) { bslash2slash(buf); - strcpy(start_path,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; } @@ -538,7 +776,7 @@ void spawn_server(char *host,char *launcher,char *serv char *control_port_str,char *server_port_str) { char localhost[BUFSIZ]; - char *dname,*conn_str,*rsh,*dname0; + char *dname,*conn_str,*rsh,*dname0,*asirhost; char AsirExe[BUFSIZ]; STRING rootdir; char prog[BUFSIZ]; @@ -566,7 +804,11 @@ void spawn_server(char *host,char *launcher,char *serv */ 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"); @@ -588,14 +830,14 @@ void spawn_server(char *host,char *launcher,char *serv // 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__) +#if defined(__CYGWIN32__) 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); + "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname,(char *)0); } } else if ( dname && get_start_path(win_start) ) { sprintf(cmd,"%s %s %s %s %s %s %s 1", @@ -606,7 +848,7 @@ void spawn_server(char *host,char *launcher,char *serv if ( !fork() ) { setpgid(0,getpid()); execlp(launcher,launcher,use_unix?".":"127.1",conn_str, - control_port_str,server_port_str,server,dname0,"-nolog",0); + control_port_str,server_port_str,server,dname0,"-nolog",(char *)0); } } #else @@ -614,11 +856,11 @@ void spawn_server(char *host,char *launcher,char *serv setpgid(0,getpid()); if ( dname ) 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); + "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str, + control_port_str,server_port_str,server,dname,(char *)0); else execlp(launcher,launcher,use_unix?".":"127.1",conn_str, - control_port_str,server_port_str,server,dname0,"-nolog",0); + control_port_str,server_port_str,server,dname0,"-nolog",(char *)0); } #endif } else if ( conn_to_serv == 2 ) { @@ -639,12 +881,12 @@ void spawn_server(char *host,char *launcher,char *serv 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", +"%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", +"%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 @@ -728,24 +970,57 @@ void ox_launch_main(int with_x,NODE arg,Obj *p) *p = (Obj)ret; } -int register_server(int af_unix,int m,int c) +void extend_mctab(int bound) { - int s,i; + int i,n; struct m_c *t; -#define INIT_TAB_SIZ 64 + if ( !m_c_tab ) { + n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ; + t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c)); + for ( i = m_c_s; i < n; i++ ) { + t[i].af_unix = 0; + t[i].m = t[i].c = -1; + } + m_c_s = n; m_c_tab = t; + }else if (bound >= m_c_s) { + n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ; + t = (struct m_c *)MALLOC_ATOMIC(n*sizeof(struct m_c)); + bzero((void *)t,n*sizeof(struct m_c)); + bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c)); + for ( i = m_c_s; i < n; i++ ) { + t[i].af_unix = 0; + t[i].m = t[i].c = -1; + } + m_c_s = n; m_c_tab = t; + }else { + return; + } +} +int available_mcindex(int ind) +{ + if (ind < 0) return 1; + extend_mctab(ind); + return m_c_tab[ind].m<0 && m_c_tab[ind].c<0; +} + +int register_server(int af_unix,int m,int c,int ind) +{ + int s,i; + struct m_c *t; if ( c < 0 ) return -1; - if ( !m_c_tab ) { - s = INIT_TAB_SIZ*sizeof(struct m_c); - m_c_tab = (struct m_c *)MALLOC_ATOMIC(s); - for ( i = 0; i < INIT_TAB_SIZ; i++ ) { - m_c_tab[i].af_unix = 0; - m_c_tab[i].m = m_c_tab[i].c = -1; + extend_mctab( (ind<0)? 0: ind ); + if(ind >= 0) { + if (m_c_tab[ind].m<0 && m_c_tab[ind].c<0) { + m_c_tab[ind].m = m; m_c_tab[ind].c = c; + m_c_tab[ind].af_unix = af_unix; + if (ind>=m_c_i) m_c_i = ind+1; + return ind; } - m_c_s = INIT_TAB_SIZ; + return -1; } -#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; @@ -757,11 +1032,11 @@ int register_server(int af_unix,int m,int 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((void *)m_c_tab,s); + t = (struct m_c *)MALLOC_ATOMIC(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; + t[m_c_s+i].af_unix = 0; + t[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; } m_c_s += INIT_TAB_SIZ; m_c_tab = t; } @@ -786,9 +1061,9 @@ int get_mcindex(int i) void Pox_select(NODE arg,LIST *rp) { - int fd,n,i,index,mcind; + int fd,n,i,index,mcind,s,maxfd,minfd; fd_set r,w,e; - NODE list,t,t1; + NODE list,t,t1,t0; Q q; double max; struct timeval interval; @@ -804,13 +1079,29 @@ void Pox_select(NODE arg,LIST *rp) tvp = 0; FD_ZERO(&r); FD_ZERO(&w); FD_ZERO(&e); - for ( t = list; t; t = NEXT(t) ) { + maxfd = minfd = -1; + for ( t = list, t0 = 0; t; t = NEXT(t) ) { index = QTOS((Q)BDY(t)); valid_mctab_index(index); - fd = get_fd(m_c_tab[index].c); FD_SET((unsigned int)fd,&r); + s = m_c_tab[index].c; + if ( ox_data_is_available(s) ) { + MKNODE(t1,(Q)BDY(t),t0); t0 = t1; + } else { + fd = get_fd(s); FD_SET((unsigned int)fd,&r); + maxfd = maxfd<0 ? fd : MAX(fd,maxfd); + minfd = minfd<0 ? fd : MIN(fd,minfd); + } } + if ( t0 ) { + MKLIST(*rp,t0); return; + } + n = select(FD_SETSIZE,&r,&w,&e,tvp); +#if defined(VISUAL) + for ( i = minfd, t = 0; n && i <= maxfd; i++ ) +#else for ( i = 0, t = 0; n && i < FD_SETSIZE; i++ ) +#endif if ( FD_ISSET(i,&r) ) { /* index : index to iofp array */ index = get_index(i); @@ -853,13 +1144,66 @@ void Pox_recv_raw_cmo(NODE arg,Obj *rp) ox_read_cmo(s,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); @@ -875,8 +1219,11 @@ void Pox_push_local(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) ) @@ -1035,6 +1382,7 @@ 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)); @@ -1076,9 +1424,12 @@ void Pox_cmo_rpc(NODE arg,Obj *rp) STRING f; USINT ui; NODE t; + Obj dmy; pointer *w; int index = QTOS((Q)ARG0(arg)); + int sync,find; + find = get_opt("sync",&sync); valid_mctab_index(index); s = m_c_tab[index].c; arg = NEXT(arg); f = (STRING)BDY(arg); arg = NEXT(arg); @@ -1091,7 +1442,11 @@ void Pox_cmo_rpc(NODE arg,Obj *rp) MKUSINT(ui,n); ox_send_data(s,ui); ox_send_data(s,f); - ox_send_cmd(s,SM_executeFunction); + if ( find && sync ) { + ox_send_cmd(s,SM_executeFunctionSync); + ox_get_result(s,&dmy); + } else + ox_send_cmd(s,SM_executeFunction); *rp = 0; } @@ -1167,11 +1522,9 @@ void Pox_shutdown(NODE arg,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 !defined(MPI) && !defined(VISUAL) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1209,11 +1562,9 @@ void shutdown_all() { 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 @@ -1221,3 +1572,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,NULL,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 *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); + setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = + (char *)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; +} +