===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.44
retrieving revision 1.53
diff -u -p -r1.44 -r1.53
--- OpenXM_contrib2/asir2000/io/tcpf.c	2003/12/09 03:07:45	1.44
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2004/03/09 07:18:26	1.53
@@ -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.43 2003/12/03 09:32:36 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.52 2004/03/09 05:33:10 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -131,7 +131,10 @@ 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();
+void Pox_get_rank_102();
 void Pox_reset_102();
+void Pox_bcast_102();
+void Pox_reduce_102();
 
 void ox_launch_generic();
 
@@ -143,13 +146,17 @@ struct ftab tcp_tab[] = {
 	{"ox_get_serverinfo",Pox_get_serverinfo,-1},
 	{"generate_port",Pgenerate_port,-1},
 
+	/* from master to client */
 	{"ox_set_rank_102",Pox_set_rank_102,3},
+	{"ox_tcp_accept_102",Pox_tcp_accept_102,3},
+	{"ox_tcp_connect_102",Pox_tcp_connect_102,4},
+	{"ox_reset_102",Pox_reset_102,1},
 
+	{"ox_get_rank_102",Pox_get_rank_102,0},
 	{"ox_send_102",Pox_send_102,2},
 	{"ox_recv_102",Pox_recv_102,1},
-	{"ox_tcp_accept_102",Pox_tcp_accept_102,2},
-	{"ox_tcp_connect_102",Pox_tcp_connect_102,3},
-	{"ox_reset_102",Pox_reset_102,1},
+	{"ox_bcast_102",Pox_bcast_102,-2},
+	{"ox_reduce_102",Pox_reduce_102,-3},
 
 	{"try_bind_listen",Ptry_bind_listen,1},
 	{"try_connect",Ptry_connect,2},
@@ -294,8 +301,20 @@ void Pox_reset_102(NODE arg,Q *rp)
 	s = m_c_tab[index].c;
 	ox_send_cmd(s,SM_reset_102);
 	ox_flush_stream_force(s);
+	*rp = 0;
 }
 
+void Pox_get_rank_102(LIST *rp)
+{
+	Q n,r;
+	NODE node;
+
+	STOQ(nserver_102,n);
+	STOQ(myrank_102,r);
+	node = mknode(2,n,r);
+	MKLIST(*rp,node);
+}
+
 void Pox_set_rank_102(NODE arg,Q *rp)
 {
 	Q nserver,rank;
@@ -313,55 +332,41 @@ void Pox_set_rank_102(NODE arg,Q *rp)
 	*rp = 0;
 }
 
-/* ox_tcp_accept_102(port,rank) */
+/* ox_tcp_accept_102(server,port,rank) */
 
 void Pox_tcp_accept_102(NODE arg,Q *rp)
 {
-	char port_str[BUFSIZ];
-	int port,s,use_unix,rank;
+	int s;
+	int	index = QTOS((Q)ARG0(arg));
 
-	if ( IS_CYGWIN || !ARG0(arg) || NUM(ARG0(arg)) ) {
-		port = QTOS((Q)ARG0(arg));
-		sprintf(port_str,"%d",port);
-		use_unix = 0;
-	} else {
-		strcpy(port_str,BDY((STRING)ARG0(arg)));
-		use_unix = 1;
-	}
-	s = try_bind_listen(use_unix,port_str);
-	s = try_accept(use_unix,s);
-	rank = QTOS((Q)ARG1(arg));
-	if ( register_102(s,rank,1) < 0 )
-		STOQ(-1,*rp);
-	else
-		*rp = 0;
+	valid_mctab_index(index);
+	s = m_c_tab[index].c;
+
+	ox_send_data(s,ARG1(arg));
+	ox_send_data(s,ARG2(arg));
+	ox_send_cmd(s,SM_tcp_accept_102);
+	ox_flush_stream_force(s);
+	*rp = 0;
 }
 
 /*
- ox_tcp_connect_102(host,port,rank)
+ ox_tcp_connect_102(server,host,port,rank)
 */
 
 void Pox_tcp_connect_102(NODE arg,Q *rp)
 {
-	char port_str[BUFSIZ];
-	char *host;
-	int port,s,use_unix,rank;
+	int s;
+	int	index = QTOS((Q)ARG0(arg));
 
-	if ( IS_CYGWIN || !ARG1(arg) || NUM(ARG1(arg)) ) {
-		port = QTOS((Q)ARG1(arg));
-		sprintf(port_str,"%d",port);
-		use_unix = 0;
-	} else {
-		strcpy(port_str,BDY((STRING)ARG1(arg)));
-		use_unix = 1;
-	}
-	host = BDY((STRING)ARG0(arg));
-	s = try_connect(use_unix,host,port_str);
-	rank = QTOS((Q)ARG2(arg));
-	if ( register_102(s,rank,0) < 0 )
-		STOQ(-1,*rp);
-	else
-		*rp = 0;
+	valid_mctab_index(index);
+	s = m_c_tab[index].c;
+
+	ox_send_data(s,ARG1(arg));
+	ox_send_data(s,ARG2(arg));
+	ox_send_data(s,ARG3(arg));
+	ox_send_cmd(s,SM_tcp_connect_102);
+	ox_flush_stream_force(s);
+	*rp = 0;	
 }
 
 /*
@@ -735,7 +740,7 @@ void spawn_server(char *host,char *launcher,char *serv
 			if ( !fork() ) {
 				setpgid(0,getpid());
 				execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
-					"-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str,
+					"-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
 					control_port_str,server_port_str,server,dname,0);
 			}
 		} else if ( dname && get_start_path(win_start) ) {
@@ -755,7 +760,7 @@ void spawn_server(char *host,char *launcher,char *serv
 			setpgid(0,getpid());
 			if ( dname )
 				execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
-					"-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str,
+					"-geometry","60x10","-xrm","XTerm*locale:false","-e",launcher,use_unix?".":"127.1",conn_str,
 					control_port_str,server_port_str,server,dname,0);
 			else 
 				execlp(launcher,launcher,use_unix?".":"127.1",conn_str,
@@ -780,12 +785,12 @@ void spawn_server(char *host,char *launcher,char *serv
 		if ( dname )
 			if ( use_ssh )
 				sprintf(cmd,
-"%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null\">/dev/null",
+"%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -xrm 'XTerm*locale:false' -e %s %s %s %s %s %s %s >&/dev/null\">/dev/null",
 				rsh,host,OX_XTERM,host,launcher,localhost,conn_str,
 				control_port_str,server_port_str,server,"1");
 			else
 				sprintf(cmd,
-"%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s >&/dev/null&\">/dev/null",
+"%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -xrm 'XTerm*locale:false' -e %s %s %s %s %s %s %s >&/dev/null&\">/dev/null",
 				rsh,host,OX_XTERM,host,dname,launcher,localhost,conn_str,
 				control_port_str,server_port_str,server,dname);
 		else
@@ -1010,6 +1015,40 @@ void Pox_recv_102(NODE arg,Obj *rp)
 	ox_recv_102(rank,&id,rp);
 }
 
+void Pox_bcast_102(NODE arg,Obj *rp)
+{
+	int rank = QTOS((Q)ARG0(arg));
+	Obj data;
+
+	if ( argc(arg) > 1 )
+		asir_push_one((Obj)ARG1(arg));
+	ox_bcast_102(rank);
+	*rp = (Obj)asir_pop_one();
+}
+
+void Pox_reduce_102(NODE arg,Obj *rp)
+{
+	int root = QTOS((Q)ARG0(arg));
+	STRING op;
+	char *opname;
+	void (*func)();
+
+	op = (STRING)ARG1(arg);
+	asir_assert(op,O_STR,"ox_reduce_102");
+	opname = BDY(op);
+	if ( !strcmp(opname,"+") )
+		func = arf_add;
+	else if ( !strcmp(opname,"*") )
+		func = arf_mul;
+	else {
+		error("ox_reduce_102 : operation not supported");
+	}
+	if ( argc(arg) > 2 )
+		asir_push_one((Obj)ARG2(arg));
+	ox_reduce_102(root,func);
+	*rp = (Obj)asir_pop_one();
+}
+
 void Pox_push_local(NODE arg,Obj *rp)
 {
 	int s;
@@ -1198,6 +1237,7 @@ void Pox_execute_string(NODE arg,Obj *rp)
 	int s;
 	int index = QTOS((Q)ARG0(arg));
 
+	asir_assert(ARG1(arg),O_STR,"ox_execute_string");
 	valid_mctab_index(index);
 	s = m_c_tab[index].c;
 	ox_send_data(s,ARG1(arg));