=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.55 retrieving revision 1.68 diff -u -p -r1.55 -r1.68 --- OpenXM_contrib2/asir2000/io/tcpf.c 2004/06/15 09:04:41 1.55 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2015/08/06 10:01:52 1.68 @@ -44,26 +44,27 @@ * 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.54 2004/03/11 07:40:42 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.67 2015/08/05 16:01:20 fujimoto Exp $ */ #include "ca.h" #include "parse.h" #include "com.h" #include #include -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) #include #include #include #endif #include "ox.h" -#if defined(VISUAL) #include +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #include #include #endif +#define INIT_TAB_SIZ 64 #define OX_XTERM "ox_xterm" #if !defined(_PA_RISC1_1) @@ -127,7 +128,6 @@ 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(); @@ -202,9 +202,6 @@ 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}, }; @@ -212,14 +209,9 @@ extern struct IOFP iofp[]; extern MATHCAP my_mathcap; extern int ox_exchange_mathcap; -char *getenv(); +Obj asir_pop_one(); +void asir_push_one(Obj); -void Pnd_exec_f4_red(Q *rp) -{ - nd_exec_f4_red_dist(); - *rp = 0; -} - #if defined(MPI) extern int mpi_myid, mpi_nprocs; @@ -471,7 +463,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 */ @@ -490,7 +482,7 @@ void Pregister_server(NODE arg,Q *rp) STOQ(ind,*rp); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) #include #include #include @@ -566,6 +558,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) && !defined(__MINGW32__) && !defined(__MINGW64__) + 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) { @@ -574,8 +605,27 @@ 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 !defined(VISUAL) + 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) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -617,7 +667,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 */ @@ -636,7 +686,7 @@ void ox_launch_generic(char *host,char *launcher,char STOQ(ind,*rp); } -#if defined(__CYGWIN__) +#if defined(__CYGWIN32__) static void bslash2slash(char *buf) { char *p; @@ -731,7 +781,7 @@ void spawn_server(char *host,char *launcher,char *serv STRING rootdir; char prog[BUFSIZ]; char *av[BUFSIZ]; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) char cmd[BUFSIZ]; #endif #if defined(__CYGWIN__) @@ -759,7 +809,7 @@ void spawn_server(char *host,char *launcher,char *serv strcpy(localhost,asirhost); else gethostname(localhost,BUFSIZ); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( !use_unix ) error("spawn_server : not implemented on Windows"); Pget_rootdir(&rootdir); @@ -780,14 +830,14 @@ void spawn_server(char *host,char *launcher,char *serv // printf("ox_launch 127.0.0.1 %s %s %s %s 0\n",conn_str,control_port_str,server_port_str,server); #else if ( use_unix || !host ) { -#if defined(__CYGWIN__) +#if defined(__CYGWIN32__) get_launcher_path(win_launcher); if ( dname && strchr(dname,':') ) { if ( !fork() ) { setpgid(0,getpid()); execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str, - control_port_str,server_port_str,server,dname,0); + 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", @@ -798,7 +848,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 @@ -807,10 +857,10 @@ void spawn_server(char *host,char *launcher,char *serv if ( dname ) execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname, "-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str, - control_port_str,server_port_str,server,dname,0); + 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 ) { @@ -920,22 +970,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 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,n*sizeof(struct m_c)); + 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++ ) @@ -949,11 +1032,11 @@ int register_server(int af_unix,int m,int c) #endif if ( m_c_i == m_c_s ) { s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c); - t = (struct m_c *)MALLOC_ATOMIC(s); bzero((void *)m_c_tab,s); + t = (struct m_c *)MALLOC_ATOMIC(s); bcopy((void *)m_c_tab,(void *)t,m_c_s*sizeof(struct m_c)); for ( i = 0; i < INIT_TAB_SIZ; i++ ) { - m_c_tab[m_c_s+i].af_unix = 0; - m_c_tab[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; + t[m_c_s+i].af_unix = 0; + t[m_c_s+i].m = m_c_tab[m_c_s+i].c = -1; } m_c_s += INIT_TAB_SIZ; m_c_tab = t; } @@ -978,9 +1061,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,maxfd,minfd; fd_set r,w,e; - NODE list,t,t1; + NODE list,t,t1,t0; Q q; double max; struct timeval interval; @@ -996,13 +1079,29 @@ 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) ) { + maxfd = minfd = -1; + 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); + maxfd = maxfd<0 ? fd : MAX(fd,maxfd); + minfd = minfd<0 ? fd : MIN(fd,minfd); + } } + if ( t0 ) { + MKLIST(*rp,t0); return; + } + n = select(FD_SETSIZE,&r,&w,&e,tvp); +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) + for ( i = minfd, t = 0; n && i <= maxfd; i++ ) +#else for ( i = 0, t = 0; n && i < FD_SETSIZE; i++ ) +#endif if ( FD_ISSET(i,&r) ) { /* index : index to iofp array */ index = get_index(i); @@ -1325,9 +1424,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); @@ -1340,7 +1442,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; } @@ -1361,7 +1467,7 @@ void Pox_reset(NODE arg,Q *rp) ox_recv(m,&id,&obj); t = (USINT)obj; } *rp = ONE; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) Sleep(100); ox_send_cmd(c,SM_nop); ox_flush_stream_force(c); @@ -1408,7 +1514,7 @@ void Pox_shutdown(NODE arg,Q *rp) { int s; int index = QTOS((Q)ARG0(arg)); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) int status; #endif @@ -1418,7 +1524,7 @@ void Pox_shutdown(NODE arg,Q *rp) free_iofp(s); s = m_c_tab[index].c; free_iofp(s); -#if !defined(MPI) && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1441,7 +1547,7 @@ void Pox_push_cmd(NODE arg,Q *rp) void shutdown_all() { int s; int i,index; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) int status; #endif @@ -1452,13 +1558,13 @@ void shutdown_all() { continue; s = m_c_tab[index].m; ox_send_cmd(s,SM_shutdown); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) Sleep(1000); #endif free_iofp(s); s = m_c_tab[index].c; free_iofp(s); -#if !defined(MPI) && !defined(VISUAL) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1496,10 +1602,10 @@ int validate_ox_plot_stream(int index) /* create an ox_plot server */ MKSTR(name,"ox_plot"); - arg = mknode(2,0,name); + arg = mknode(2,NULL,name); Pox_launch_nox(arg,&r); i = QTOS((Q)r); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) Sleep(100); ox_send_cmd(m_c_tab[i].c,SM_nop); ox_flush_stream_force(m_c_tab[i].c); @@ -1519,7 +1625,7 @@ int register_102(int s1,int rank,int is_master) if ( rank >= MAXIOFP ) return -1; iofp_102[rank].s = s1; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) iofp_102[rank].in = WSIO_open(s1,"r"); iofp_102[rank].out = WSIO_open(s1,"w"); #else @@ -1527,9 +1633,9 @@ int register_102(int s1,int rank,int is_master) 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); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = - (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); #endif #endif if ( little_endian )