=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.40 retrieving revision 1.58 diff -u -p -r1.40 -r1.58 --- OpenXM_contrib2/asir2000/io/tcpf.c 2003/03/12 07:56:23 1.40 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2010/09/01 08:01:09 1.58 @@ -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.39 2003/03/07 06:39:57 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.57 2010/04/23 04:44:52 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -79,6 +79,8 @@ static struct m_c { static int m_c_i,m_c_s; int I_am_server; +extern int little_endian; + #if defined(MPI) extern int mpi_nprocs; #define valid_mctab_index(ind)\ @@ -87,13 +89,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 +127,14 @@ void Pgenerate_port(),Ptry_bind_listen(),Ptry_connect( void Pregister_server(); void Pox_get_serverinfo(); void Pox_mpi_myid(), Pox_mpi_nprocs(); +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(); @@ -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}, @@ -173,7 +202,9 @@ struct ftab tcp_tab[] = { {"ox_execute_string",Pox_execute_string,2}, {"ox_execute_function",Pox_execute_function,3}, + {"nd_exec_f4_red",Pnd_exec_f4_red,0}, + {0,0,0}, }; @@ -183,6 +214,12 @@ extern int ox_exchange_mathcap; char *getenv(); +void Pnd_exec_f4_red(Q *rp) +{ + nd_exec_f4_red_dist(); + *rp = 0; +} + #if defined(MPI) extern int mpi_myid, mpi_nprocs; @@ -255,7 +292,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) */ @@ -376,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) @@ -409,6 +566,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) { @@ -418,6 +614,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 { @@ -626,8 +825,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", @@ -638,7 +837,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 @@ -646,11 +845,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 ) { @@ -671,12 +870,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 @@ -818,9 +1017,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; @@ -836,11 +1035,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) ) { @@ -885,13 +1093,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); @@ -907,8 +1168,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) ) @@ -1067,6 +1331,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)); @@ -1108,9 +1373,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); @@ -1123,7 +1391,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; } @@ -1289,3 +1561,52 @@ int validate_ox_plot_stream(int index) #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 *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = + (char *)GC_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; +} +