=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.47 retrieving revision 1.54 diff -u -p -r1.47 -r1.54 --- OpenXM_contrib2/asir2000/io/tcpf.c 2003/12/10 07:37:40 1.47 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2004/03/11 07:40:42 1.54 @@ -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.46 2003/12/10 05:39:58 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.53 2004/03/09 07:18:26 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -89,10 +89,10 @@ 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 @@ -131,6 +131,7 @@ 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(); @@ -151,10 +152,11 @@ struct ftab tcp_tab[] = { {"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}, + {"ox_reduce_102",Pox_reduce_102,-3}, {"try_bind_listen",Ptry_bind_listen,1}, {"try_connect",Ptry_connect,2}, @@ -299,8 +301,20 @@ void Pox_reset_102(NODE arg,Q *rp) 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; @@ -726,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) ) { @@ -746,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, @@ -771,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 @@ -1006,18 +1020,15 @@ void Pox_bcast_102(NODE arg,Obj *rp) int rank = QTOS((Q)ARG0(arg)); Obj data; - if ( rank == myrank_102 ) { - if ( argc(arg) == 1 ) - error("ox_bcast_102 : data should be given at the root"); - data = (Obj)ARG1(arg); - } - ox_bcast_102(rank,&data); - *rp = 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 rank = QTOS((Q)ARG0(arg)); + int root = QTOS((Q)ARG0(arg)); STRING op; char *opname; void (*func)(); @@ -1032,7 +1043,10 @@ void Pox_reduce_102(NODE arg,Obj *rp) else { error("ox_reduce_102 : operation not supported"); } - ox_reduce_102(rank,func,(Obj)ARG2(arg),rp); + 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) @@ -1223,6 +1237,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));