=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.71 retrieving revision 1.75 diff -u -p -r1.71 -r1.75 --- OpenXM_contrib2/asir2000/io/tcpf.c 2016/08/24 00:52:50 1.71 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2017/09/04 01:57:53 1.75 @@ -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.70 2015/08/14 13:51:55 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" @@ -1450,23 +1450,52 @@ 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 ( no_ox_reset(c) == 1 ) - error("The server does not implement ox_reset"); - 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__) @@ -1589,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; @@ -1605,7 +1636,8 @@ 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__) Sleep(100);