=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.43 retrieving revision 1.51 diff -u -p -r1.43 -r1.51 --- OpenXM_contrib2/asir2000/io/tcpf.c 2003/12/03 09:32:36 1.43 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2004/03/05 06:14:50 1.51 @@ -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.50 2003/12/13 08:03:56 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -96,9 +96,10 @@ if((ind)<0||(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 +128,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 +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}, - {"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 +292,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; } /* @@ -699,7 +740,7 @@ 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, + "-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) ) { @@ -719,7 +760,7 @@ 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, + "-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,use_unix?".":"127.1",conn_str, @@ -744,12 +785,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 @@ -958,27 +999,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; @@ -1422,7 +1492,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 +1501,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 -}