=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.58 retrieving revision 1.75 diff -u -p -r1.58 -r1.75 --- OpenXM_contrib2/asir2000/io/tcpf.c 2010/09/01 08:01:09 1.58 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2017/09/04 01:57:53 1.75 @@ -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.57 2010/04/23 04:44:52 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.74 2016/09/27 07:37:47 noro Exp $ */ #include "ca.h" #include "parse.h" #include "com.h" #include #include -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) #include #include #include #endif #include "ox.h" -#if defined(VISUAL) #include +#if defined(VISUAL) || defined(__MINGW32__) #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__) #include #include #include @@ -574,7 +566,7 @@ void ox_launcher_101_generic(char *host,char *launcher char control_port_str[BUFSIZ]; Obj obj; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -613,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__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -656,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 */ @@ -675,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; @@ -770,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__) char cmd[BUFSIZ]; #endif #if defined(__CYGWIN__) @@ -798,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__) if ( !use_unix ) error("spawn_server : not implemented on Windows"); Pget_rootdir(&rootdir); @@ -819,7 +830,7 @@ 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() ) { @@ -959,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++ ) @@ -988,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; } @@ -1017,7 +1061,7 @@ int get_mcindex(int i) void Pox_select(NODE arg,LIST *rp) { - int fd,n,i,index,mcind,s; + int fd,n,i,index,mcind,s,maxfd,minfd; fd_set r,w,e; NODE list,t,t1,t0; Q q; @@ -1035,6 +1079,7 @@ void Pox_select(NODE arg,LIST *rp) tvp = 0; FD_ZERO(&r); FD_ZERO(&w); FD_ZERO(&e); + maxfd = minfd = -1; for ( t = list, t0 = 0; t; t = NEXT(t) ) { index = QTOS((Q)BDY(t)); valid_mctab_index(index); @@ -1043,6 +1088,8 @@ void Pox_select(NODE arg,LIST *rp) 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 ) { @@ -1050,7 +1097,11 @@ void Pox_select(NODE arg,LIST *rp) } n = select(FD_SETSIZE,&r,&w,&e,tvp); +#if defined(VISUAL) || defined(__MINGW32__) + 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); @@ -1399,24 +1450,55 @@ void Pox_cmo_rpc(NODE arg,Obj *rp) *rp = 0; } +int No_ox_reset; +extern Q ox_pari_stream; +extern int ox_pari_stream_initialized; + void Pox_reset(NODE arg,Q *rp) { USINT t; int id,c,m; Obj obj; + NODE nd; + Q q; int index = QTOS((Q)ARG0(arg)); valid_mctab_index(index); m = m_c_tab[index].m; c = m_c_tab[index].c; if ( m >= 0 ) { - if ( argc(arg) == 1 ) { + if ( no_ox_reset(c) == 1 ) { + STOQ(index,q); + nd = mknode(1,q); + switch ( No_ox_reset ) { + case 1: + fprintf(stderr,"The server does not implenent OX reset protocol.\n"); + fprintf(stderr,"The server is terminated.\n"); + Pox_shutdown(nd,rp); + if ( index == QTOS(ox_pari_stream) ) ox_pari_stream_initialized = 0; + break; + case 2: + Pox_shutdown(nd,rp); + if ( index == QTOS(ox_pari_stream) ) ox_pari_stream_initialized = 0; + break; + default: + error("The server does not implement OX reset protocol."); + *rp = ONE; + break; + } + return; + } + + if ( argc(arg) == 1 ) { ox_send_cmd(m,SM_control_reset_connection); ox_flush_stream_force(m); +#if 0 + /* XXX obsolete */ ox_recv(m,&id,&obj); t = (USINT)obj; +#endif } *rp = ONE; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) Sleep(100); ox_send_cmd(c,SM_nop); ox_flush_stream_force(c); @@ -1463,7 +1545,7 @@ void Pox_shutdown(NODE arg,Q *rp) { int s; int index = QTOS((Q)ARG0(arg)); -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) int status; #endif @@ -1473,7 +1555,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__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1496,7 +1578,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__) int status; #endif @@ -1507,13 +1589,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__) 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__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1536,6 +1618,8 @@ int is_ox_plot(int index) return strcmp(name,"ox_plot") ? 0 : 1; } +int debug_plot; + int validate_ox_plot_stream(int index) { int i; @@ -1551,10 +1635,11 @@ int validate_ox_plot_stream(int index) /* create an ox_plot server */ MKSTR(name,"ox_plot"); - arg = mknode(2,0,name); - Pox_launch_nox(arg,&r); + arg = mknode(2,NULL,name); + if ( debug_plot ) Pox_launch(arg,&r); + else Pox_launch_nox(arg,&r); i = QTOS((Q)r); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) Sleep(100); ox_send_cmd(m_c_tab[i].c,SM_nop); ox_flush_stream_force(m_c_tab[i].c); @@ -1574,7 +1659,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__) iofp_102[rank].in = WSIO_open(s1,"r"); iofp_102[rank].out = WSIO_open(s1,"w"); #else @@ -1582,9 +1667,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 )