=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.59 retrieving revision 1.62 diff -u -p -r1.59 -r1.62 --- OpenXM_contrib2/asir2000/io/tcpf.c 2010/12/12 03:20:53 1.59 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2012/12/17 07:20:45 1.62 @@ -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.58 2010/09/01 08:01:09 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.61 2011/06/16 08:17:15 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -1070,7 +1070,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; @@ -1088,6 +1088,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); @@ -1096,6 +1097,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 ) { @@ -1103,7 +1106,11 @@ void Pox_select(NODE arg,LIST *rp) } n = select(FD_SETSIZE,&r,&w,&e,tvp); +#if defined(VISUAL) + 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); @@ -1604,7 +1611,7 @@ 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) @@ -1635,9 +1642,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 )