===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- OpenXM_contrib2/asir2000/io/tcpf.c	1999/12/24 06:57:22	1.4
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2000/07/14 08:26:40	1.9
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.3 1999/12/21 04:20:42 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.8 2000/07/13 05:09:03 noro Exp $ */
 #if INET
 #include "ca.h"
 #include "parse.h"
@@ -31,21 +31,23 @@ static int m_c_i,m_c_s;
 #if MPI
 extern int mpi_nprocs;
 #define valid_mctab_index(ind)\
-if((ind)<0||(ind)>=(mpi_nprocs-1)){error("invalid server id");}
+if((ind)<0||(ind)>=mpi_nprocs){error("invalid server id");}
 #else
 #define valid_mctab_index(ind)\
 if((ind)<0||(ind)>=m_c_i||\
-(!m_c_tab[ind].m&&!m_c_tab[ind].c)){error("invalid server id");}
+((m_c_tab[ind].m<0)&&(m_c_tab[ind].c<0))){error("invalid server id");}
 #endif
 
 int register_server();
 int get_mcindex(int);
 
+void Pox_send_raw_cmo(), Pox_recv_raw_cmo();
+
 void Pox_launch(),Pox_launch_nox(),Pox_launch_main();
 void Pox_launch_generic();
 void Pox_shutdown();
 
-void Pox_rpc(),Pox_cmo_rpc(),Pox_reset(),Pox_sync(),Pox_select();
+void Pox_rpc(),Pox_cmo_rpc(),Pox_reset(),Pox_intr(),Pox_sync(),Pox_select();
 
 void Pox_push_local(),Pox_push_cmo(),Pox_push_vl(),Pox_push_cmd();
 
@@ -60,12 +62,15 @@ void Pox_flush();
 void Pgenerate_port(),Ptry_bind_listen(),Ptry_connect(),Ptry_accept();
 void Pregister_server();
 void Pox_get_serverinfo();
+void Pox_mpi_myid(), Pox_mpi_nprocs();
 
 void ox_launch_generic();
 
 pointer bevalf();
 
 struct ftab tcp_tab[] = {
+	{"ox_send_raw_cmo",Pox_send_raw_cmo,2},
+	{"ox_recv_raw_cmo",Pox_recv_raw_cmo,1},
 	{"ox_get_serverinfo",Pox_get_serverinfo,-1},
 	{"generate_port",Pgenerate_port,-1},
 	{"try_bind_listen",Ptry_bind_listen,1},
@@ -82,8 +87,13 @@ struct ftab tcp_tab[] = {
 	{"ox_cmo_rpc",Pox_cmo_rpc,-99999999},
 
 	{"ox_sync",Pox_sync,1},
+#if MPI
+	{"ox_mpi_myid",Pox_mpi_myid,0},
+	{"ox_mpi_nprocs",Pox_mpi_nprocs,0},
+#endif
 #if !MPI
 	{"ox_reset",Pox_reset,-2},
+	{"ox_intr",Pox_intr,1},
 	{"ox_select",Pox_select,-2},
 #endif
 
@@ -113,9 +123,26 @@ struct ftab tcp_tab[] = {
 
 extern struct IOFP iofp[];
 extern MATHCAP my_mathcap;
+extern int ox_exchange_mathcap;
 
 char *getenv();
 
+#if MPI
+extern int mpi_myid, mpi_nprocs;
+
+void Pox_mpi_myid(rp)
+Q *rp;
+{
+	STOQ(mpi_myid,*rp);
+}
+
+void Pox_mpi_nprocs(rp)
+Q *rp;
+{
+	STOQ(mpi_nprocs,*rp);
+}
+#endif
+
 void Pox_get_serverinfo(arg,rp)
 NODE arg;
 LIST *rp;
@@ -127,7 +154,7 @@ LIST *rp;
 
 	if ( !arg ) {
 		for ( i = 0, n0 = 0; i < m_c_i; i++ )
-			if ( m_c_tab[i].m || m_c_tab[i].c ) {
+			if ( (m_c_tab[i].m>=0) || (m_c_tab[i].c>=0) ) {
 				c = m_c_tab[i].c;
 				ox_get_serverinfo(c,&list);
 				STOQ(i,sid);
@@ -141,7 +168,7 @@ LIST *rp;
 		MKLIST(*rp,n0);	
 	} else {
 		i = QTOS((Q)ARG0(arg));
-		if ( i >= 0 && i < m_c_i && (m_c_tab[i].m || m_c_tab[i].c) )
+		if ( i >= 0 && i < m_c_i && ((m_c_tab[i].m>=0) || (m_c_tab[i].c>=0)) )
 			ox_get_serverinfo(m_c_tab[i].c,rp);
 		else {
 			MKLIST(*rp,0);
@@ -282,18 +309,19 @@ Q *rp;
 	/* register server to the server list */
 	ind = register_server(use_unix,cn,sn);
 
-	/* request remote mathcap */
-	ox_send_cmd(sn,SM_mathcap);
-	ox_send_cmd(sn,SM_popCMO);
-	ox_flush_stream_force(sn);
-	ox_recv(sn,&id,&server_mathcap);
-	store_remote_mathcap(sn,server_mathcap);
-
-	/* send my mathcap */
-	create_my_mathcap("asir");
-	ox_send_data(sn,my_mathcap);
-	ox_send_cmd(sn,SM_setMathcap);
-
+	if ( ox_exchange_mathcap ) {
+		/* request remote mathcap */
+		ox_send_cmd(sn,SM_mathcap);
+		ox_send_cmd(sn,SM_popCMO);
+		ox_flush_stream_force(sn);
+		ox_recv(sn,&id,&server_mathcap);
+		store_remote_mathcap(sn,server_mathcap);
+	
+		/* send my mathcap */
+		create_my_mathcap("asir");
+		ox_send_data(sn,my_mathcap);
+		ox_send_cmd(sn,SM_setMathcap);
+	}
 	/* return the server id */
 	STOQ(ind,*rp);
 }
@@ -370,18 +398,19 @@ Q *rp;
 	/* register server to the server list */
 	ind = register_server(use_unix,cn,sn);
 
-	/* request remote mathcap */
-	ox_send_cmd(sn,SM_mathcap);
-	ox_send_cmd(sn,SM_popCMO);
-	ox_flush_stream_force(sn);
-	ox_recv(sn,&id,&server_mathcap);
-	store_remote_mathcap(sn,server_mathcap);
-
-	/* send my mathcap */
-	create_my_mathcap("asir");
-	ox_send_data(sn,my_mathcap);
-	ox_send_cmd(sn,SM_setMathcap);
-
+	if ( ox_exchange_mathcap ) {
+		/* request remote mathcap */
+		ox_send_cmd(sn,SM_mathcap);
+		ox_send_cmd(sn,SM_popCMO);
+		ox_flush_stream_force(sn);
+		ox_recv(sn,&id,&server_mathcap);
+		store_remote_mathcap(sn,server_mathcap);
+	
+		/* send my mathcap */
+		create_my_mathcap("asir");
+		ox_send_data(sn,my_mathcap);
+		ox_send_cmd(sn,SM_setMathcap);
+	}
 	/* return the server id */
 	STOQ(ind,*rp);
 }
@@ -519,17 +548,22 @@ int af_unix,m,c;
 {
 	int s,i,ci;
 	struct m_c *t;
+#define INIT_TAB_SIZ 64
 
 	if ( c < 0 )
 		return -1;
 	if ( !m_c_tab ) {
-		s = BUFSIZ*sizeof(struct m_c);
-		m_c_tab = (struct m_c *)MALLOC_ATOMIC(s); bzero(m_c_tab,s);
-		m_c_s = BUFSIZ;
+		s = INIT_TAB_SIZ*sizeof(struct m_c);
+		m_c_tab = (struct m_c *)MALLOC_ATOMIC(s);
+		for ( i = 0; i < INIT_TAB_SIZ; i++ ) {
+			m_c_tab[i].af_unix = 0;
+			m_c_tab[i].m = m_c_tab[i].c = -1;
+		}
+		m_c_s = INIT_TAB_SIZ;
 	}
 #if !MPI
 	for ( i = 0; i < m_c_i; i++ )
-		if ( !m_c_tab[i].m && !m_c_tab[i].c )
+		if ( (m_c_tab[i].m<0) && (m_c_tab[i].c<0) )
 			break;
 	if ( i < m_c_i ) {
 		m_c_tab[i].m = m; m_c_tab[i].c = c;
@@ -538,10 +572,14 @@ int af_unix,m,c;
 	}
 #endif
 	if ( m_c_i == m_c_s ) {
-		s = (m_c_s+BUFSIZ)*sizeof(struct m_c);
+		s = (m_c_s+INIT_TAB_SIZ)*sizeof(struct m_c);
 		t = (struct m_c *)MALLOC_ATOMIC(s); bzero(m_c_tab,s);
 		bcopy(m_c_tab,t,m_c_s*sizeof(struct m_c));
-		m_c_s += BUFSIZ; m_c_tab = t;
+		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;
+		}
+		m_c_s += INIT_TAB_SIZ; m_c_tab = t;
 	}
 	m_c_tab[m_c_i].m = m; m_c_tab[m_c_i].c = c;
 	m_c_tab[m_c_i].af_unix = af_unix;
@@ -613,6 +651,33 @@ Q *rp;
 	*rp = ONE;
 }
 
+void Pox_send_raw_cmo(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	int s;
+	int index = QTOS((Q)ARG0(arg));
+
+	valid_mctab_index(index);
+	s = m_c_tab[index].c;
+	ox_write_cmo(s,(Obj)ARG1(arg));
+	/* flush always */
+	ox_flush_stream(s);
+	*rp = 0;
+}
+
+void Pox_recv_raw_cmo(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	int s;
+	int index = QTOS((Q)ARG0(arg));
+
+	valid_mctab_index(index);
+	s = m_c_tab[index].c;
+	ox_read_cmo(s,rp);
+}
+
 void Pox_push_local(arg,rp)
 NODE arg;
 Obj *rp;
@@ -924,6 +989,26 @@ Q *rp;
 		*rp = 0;
 }
 
+void Pox_intr(arg,rp)
+NODE arg;
+Q *rp;
+{
+	int m;
+	Obj obj;
+	int index = QTOS((Q)ARG0(arg));
+
+	valid_mctab_index(index);
+	m = m_c_tab[index].m;
+	if ( m >= 0 ) {
+		if ( argc(arg) == 1 ) {
+			ox_send_cmd(m,SM_control_intr);
+			ox_flush_stream_force(m);
+		}
+		*rp = ONE;
+	} else
+		*rp = 0;
+}
+
 void Pox_sync(arg,rp)
 NODE arg;
 Q *rp;
@@ -953,7 +1038,7 @@ Q *rp;
 	if ( m_c_tab[index].af_unix )
 		wait(&status);
 #endif
-	m_c_tab[index].m = 0; m_c_tab[index].c = 0;
+	m_c_tab[index].m = -1; m_c_tab[index].c = -1;
 	m_c_tab[index].af_unix = 0;
 	*rp = 0;
 }
@@ -962,11 +1047,11 @@ void Pox_push_cmd(arg,rp)
 NODE arg;
 Q *rp;
 {
-	unsigned int ui;
+	int ui;
 	int index = QTOS((Q)ARG0(arg));
 
 	valid_mctab_index(index);
-	ui = (unsigned int)QTOS((Q)ARG1(arg));
+	ui = QTOS((Q)ARG1(arg));
 	ox_send_cmd(m_c_tab[index].c,ui);
 	*rp = 0;
 }