===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.59
retrieving revision 1.67
diff -u -p -r1.59 -r1.67
--- OpenXM_contrib2/asir2000/io/tcpf.c	2010/12/12 03:20:53	1.59
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2015/08/05 16:01:20	1.67
@@ -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.66 2013/11/22 00:43:41 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -58,8 +58,8 @@
 #endif
 #include "ox.h"
 
-#if defined(VISUAL)
 #include <stdlib.h>
+#if defined(VISUAL)
 #include <winsock2.h>
 #include <process.h>
 #endif
@@ -128,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();
@@ -203,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},
 };
 
@@ -213,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;
 
@@ -695,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;
@@ -839,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() ) {
@@ -981,7 +972,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;
@@ -994,7 +985,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;
@@ -1041,11 +1032,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;
 	}
@@ -1070,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;
@@ -1088,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);
@@ -1096,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 ) {
@@ -1103,7 +1097,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 +1602,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 +1633,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 )