=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.44 retrieving revision 1.55 diff -u -p -r1.44 -r1.55 --- OpenXM_contrib2/asir2000/io/tcpf.c 2003/12/09 03:07:45 1.44 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2004/06/15 09:04:41 1.55 @@ -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.43 2003/12/03 09:32:36 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.54 2004/03/11 07:40:42 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,7 +131,10 @@ 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(); @@ -143,13 +146,17 @@ struct ftab tcp_tab[] = { {"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_tcp_accept_102",Pox_tcp_accept_102,2}, - {"ox_tcp_connect_102",Pox_tcp_connect_102,3}, - {"ox_reset_102",Pox_reset_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}, @@ -294,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; @@ -313,55 +332,41 @@ void Pox_set_rank_102(NODE arg,Q *rp) *rp = 0; } -/* ox_tcp_accept_102(port,rank) */ +/* ox_tcp_accept_102(server,port,rank) */ void Pox_tcp_accept_102(NODE arg,Q *rp) { - char port_str[BUFSIZ]; - int port,s,use_unix,rank; + int s; + int index = QTOS((Q)ARG0(arg)); - 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; + 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(host,port,rank) + ox_tcp_connect_102(server,host,port,rank) */ 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; } /* @@ -485,6 +490,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) @@ -527,6 +575,9 @@ void ox_launch_generic(char *host,char *launcher,char Obj obj; MATHCAP server_mathcap; +#if !defined(VISUAL) + if ( use_unix && !find_executable("xterm") ) use_x = 0; +#endif control_port_str[0] = 0; server_port_str[0] = 0; do { @@ -735,7 +786,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) ) { @@ -755,7 +806,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, @@ -780,12 +831,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 @@ -1010,6 +1061,40 @@ void Pox_recv_102(NODE arg,Obj *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; @@ -1198,6 +1283,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));