=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.68 retrieving revision 1.75 diff -u -p -r1.68 -r1.75 --- OpenXM_contrib2/asir2000/io/tcpf.c 2015/08/06 10:01:52 1.68 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2017/09/04 01:57:53 1.75 @@ -44,14 +44,14 @@ * 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.67 2015/08/05 16:01:20 fujimoto 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) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) #include #include #include @@ -59,7 +59,7 @@ #include "ox.h" #include -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #endif @@ -482,7 +482,7 @@ void Pregister_server(NODE arg,Q *rp) STOQ(ind,*rp); } -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) #include #include #include @@ -566,7 +566,7 @@ void ox_launcher_101_generic(char *host,char *launcher char control_port_str[BUFSIZ]; Obj obj; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -625,7 +625,7 @@ void ox_launch_generic(char *host,char *launcher,char STOQ(-1,*rp); return; } -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -781,7 +781,7 @@ void spawn_server(char *host,char *launcher,char *serv STRING rootdir; char prog[BUFSIZ]; char *av[BUFSIZ]; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) char cmd[BUFSIZ]; #endif #if defined(__CYGWIN__) @@ -809,7 +809,7 @@ void spawn_server(char *host,char *launcher,char *serv strcpy(localhost,asirhost); else gethostname(localhost,BUFSIZ); -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) if ( !use_unix ) error("spawn_server : not implemented on Windows"); Pget_rootdir(&rootdir); @@ -1097,7 +1097,7 @@ void Pox_select(NODE arg,LIST *rp) } n = select(FD_SETSIZE,&r,&w,&e,tvp); -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#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++ ) @@ -1450,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) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) Sleep(100); ox_send_cmd(c,SM_nop); ox_flush_stream_force(c); @@ -1514,7 +1545,7 @@ void Pox_shutdown(NODE arg,Q *rp) { int s; int index = QTOS((Q)ARG0(arg)); -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) int status; #endif @@ -1524,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) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1547,7 +1578,7 @@ void Pox_push_cmd(NODE arg,Q *rp) void shutdown_all() { int s; int i,index; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) int status; #endif @@ -1558,13 +1589,13 @@ void shutdown_all() { continue; s = m_c_tab[index].m; ox_send_cmd(s,SM_shutdown); -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#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) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(MPI) && !defined(VISUAL) && !defined(__MINGW32__) if ( m_c_tab[index].af_unix ) wait(&status); #endif @@ -1587,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; @@ -1603,9 +1636,10 @@ int validate_ox_plot_stream(int index) /* create an ox_plot server */ MKSTR(name,"ox_plot"); arg = mknode(2,NULL,name); - Pox_launch_nox(arg,&r); + if ( debug_plot ) Pox_launch(arg,&r); + else Pox_launch_nox(arg,&r); i = QTOS((Q)r); -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#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); @@ -1625,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) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) iofp_102[rank].in = WSIO_open(s1,"r"); iofp_102[rank].out = WSIO_open(s1,"w"); #else