=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.64 retrieving revision 1.69 diff -u -p -r1.64 -r1.69 --- OpenXM_contrib2/asir2000/io/tcpf.c 2013/09/26 00:38:47 1.64 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2015/08/08 14:19:42 1.69 @@ -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.63 2013/06/13 18:40:31 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.68 2015/08/06 10:01:52 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 @@ -59,7 +59,7 @@ #include "ox.h" #include -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) #include #include #endif @@ -482,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,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__) && !defined(__MINGW64__) 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) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) if ( use_unix && !find_executable("xterm") ) use_x = 0; #endif control_port_str[0] = 0; @@ -686,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; @@ -781,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__) @@ -809,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); @@ -830,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() ) { @@ -875,6 +875,9 @@ void spawn_server(char *host,char *launcher,char *serv rsh,host,launcher,server,localhost, control_port_str,server_port_str,server); fprintf(stderr,"%s\n",cmd); +#if defined(__MINGW32__) || defined(__MINGW64__) + fflush(stderr); +#endif sleep(20); /* system(cmd); */ } else { @@ -972,7 +975,7 @@ void ox_launch_main(int with_x,NODE arg,Obj *p) void extend_mctab(int bound) { - int s,i,n; + int i,n; struct m_c *t; if ( !m_c_tab ) { n = (bound/INIT_TAB_SIZ + 1)*INIT_TAB_SIZ; @@ -985,7 +988,7 @@ void extend_mctab(int bound) }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,s); + 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; @@ -1032,11 +1035,11 @@ int register_server(int af_unix,int m,int c,int ind) #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; } @@ -1097,7 +1100,7 @@ void Pox_select(NODE arg,LIST *rp) } n = select(FD_SETSIZE,&r,&w,&e,tvp); -#if defined(VISUAL) +#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++ ) @@ -1467,7 +1470,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); @@ -1514,7 +1517,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 @@ -1524,7 +1527,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 @@ -1547,7 +1550,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 @@ -1558,13 +1561,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 @@ -1605,7 +1608,7 @@ int validate_ox_plot_stream(int index) 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); @@ -1625,7 +1628,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