=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.43 retrieving revision 1.59 diff -u -p -r1.43 -r1.59 --- OpenXM_contrib2/asir2000/io/tcpf.c 2003/12/03 09:32:36 1.43 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2010/12/12 03:20:53 1.59 @@ -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.42 2003/09/19 02:33:14 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.58 2010/09/01 08:01:09 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -64,6 +64,7 @@ #include #endif +#define INIT_TAB_SIZ 64 #define OX_XTERM "ox_xterm" #if !defined(_PA_RISC1_1) @@ -89,16 +90,17 @@ 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 -static struct IOFP iofp_102[MAXIOFP]; +struct IOFP iofp_102[MAXIOFP]; +int nserver_102; +int myrank_102; -void flush_stream_102(int rank), flush_stream_force_102(int rank); int register_102(int s,int rank, int is_master); int register_server(); @@ -127,8 +129,13 @@ void Pregister_server(); void Pox_get_serverinfo(); void Pox_mpi_myid(), Pox_mpi_nprocs(); void Pnd_exec_f4_red(); -void Paccept_102(),Pconnect_102(); -void Pox_send_cmo_102(),Pox_recv_cmo_102(); +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(); @@ -139,10 +146,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}, - {"ox_send_cmo_102",Pox_send_cmo_102,2}, - {"ox_recv_cmo_102",Pox_recv_cmo_102,1}, - {"accept_102",Paccept_102,2}, - {"connect_102",Pconnect_102,3}, + + /* 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}, @@ -277,55 +293,81 @@ void Pgenerate_port(NODE arg,Obj *rp) } } -/* accept_102(port,rank) */ +void Pox_reset_102(NODE arg,Q *rp) +{ + int s; + int index = QTOS((Q)ARG0(arg)); -void Paccept_102(NODE arg,Q *rp) + 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) { - char port_str[BUFSIZ]; - int port,s,use_unix,rank; + Q n,r; + NODE node; - if ( IS_CYGWIN || !ARG0(arg) || NUM(ARG0(arg)) ) { - port = QTOS((Q)ARG0(arg)); - sprintf(port_str,"%d",port); - use_unix = 0; - } else { - strcpy(port_str,BDY((STRING)ARG0(arg))); - use_unix = 1; - } - s = try_bind_listen(use_unix,port_str); - s = try_accept(use_unix,s); - rank = QTOS((Q)ARG1(arg)); - if ( register_102(s,rank,1) < 0 ) - STOQ(-1,*rp); - else - *rp = 0; + 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; +} + /* - connect_102(host,port,rank) + ox_tcp_connect_102(server,host,port,rank) */ -void Pconnect_102(NODE arg,Q *rp) +void Pox_tcp_connect_102(NODE arg,Q *rp) { - char port_str[BUFSIZ]; - char *host; - int port,s,use_unix,rank; + int s; + int index = QTOS((Q)ARG0(arg)); - if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) { - port = QTOS((Q)ARG1(arg)); - sprintf(port_str,"%d",port); - use_unix = 0; - } else { - strcpy(port_str,BDY((STRING)ARG1(arg))); - use_unix = 1; - } - host = BDY((STRING)ARG0(arg)); - s = try_connect(use_unix,host,port_str); - rank = QTOS((Q)ARG2(arg)); - if ( register_102(s,rank,0) < 0 ) - STOQ(-1,*rp); - else - *rp = 0; + 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; } /* @@ -430,7 +472,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 */ @@ -449,6 +491,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) @@ -482,6 +567,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) { @@ -490,7 +614,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 { @@ -530,7 +676,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 */ @@ -699,8 +845,8 @@ void spawn_server(char *host,char *launcher,char *serv 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", @@ -711,7 +857,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 @@ -719,11 +865,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 ) { @@ -744,12 +890,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 @@ -833,22 +979,55 @@ 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 s,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,s); + 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 !defined(MPI) for ( i = 0; i < m_c_i; i++ ) @@ -891,9 +1070,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; fd_set r,w,e; - NODE list,t,t1; + NODE list,t,t1,t0; Q q; double max; struct timeval interval; @@ -909,11 +1088,20 @@ 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) ) { + 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); + } } + if ( t0 ) { + MKLIST(*rp,t0); return; + } + n = select(FD_SETSIZE,&r,&w,&e,tvp); for ( i = 0, t = 0; n && i < FD_SETSIZE; i++ ) if ( FD_ISSET(i,&r) ) { @@ -958,27 +1146,56 @@ void Pox_recv_raw_cmo(NODE arg,Obj *rp) ox_read_cmo(s,rp); } -void Pox_send_cmo_102(NODE arg,Obj *rp) +void Pox_send_102(NODE arg,Obj *rp) { - FILE *fp; int rank = QTOS((Q)ARG0(arg)); - fp = iofp_102[rank].out; - write_cmo(fp,(Obj)ARG1(arg)); - /* flush always */ - flush_stream_102(rank); + ox_send_data_102(rank,(Obj)ARG1(arg)); *rp = 0; } -void Pox_recv_cmo_102(NODE arg,Obj *rp) +void Pox_recv_102(NODE arg,Obj *rp) { - FILE *fp; + int id; int rank = QTOS((Q)ARG0(arg)); - fp = iofp_102[rank].in; - read_cmo(fp,rp); + 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; @@ -1167,6 +1384,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)); @@ -1208,9 +1426,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); @@ -1223,7 +1444,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; } @@ -1422,7 +1647,7 @@ int register_102(int s1,int rank,int is_master) if ( is_master ) { /* server : write -> read */ write_char((FILE *)iofp_102[rank].out,&c); - flush_stream_force_102(rank); + ox_flush_stream_force_102(rank); read_char((FILE *)iofp_102[rank].in,&rc); } else { /* client : read -> write */ @@ -1431,29 +1656,10 @@ int register_102(int s1,int rank,int is_master) if ( rc !=0 && rc != 1 && rc != 0xff ) return -1; write_char((FILE *)iofp_102[rank].out,&c); - flush_stream_force_102(rank); + ox_flush_stream_force_102(rank); } iofp_102[rank].conv = c == rc ? 0 : 1; iofp_102[rank].socket = 0; return 0; } -extern int ox_batch; - -void flush_stream_102(int rank) -{ - if ( !ox_batch ) - flush_stream_force_102(rank); -} - -void flush_stream_force_102(int rank) -{ - if ( iofp_102[rank].out ) -#if defined(VISUAL) - cflush(iofp_102[rank].out); -#elif MPI - cflush(iofp_102[rank].out); -#else - fflush(iofp_102[rank].out); -#endif -}