===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.47
retrieving revision 1.50
diff -u -p -r1.47 -r1.50
--- OpenXM_contrib2/asir2000/io/tcpf.c	2003/12/10 07:37:40	1.47
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2003/12/13 08:03:56	1.50
@@ -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.46 2003/12/10 05:39:58 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.49 2003/12/12 04:59:59 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -131,6 +131,7 @@ 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();
@@ -151,10 +152,11 @@ struct ftab tcp_tab[] = {
 	{"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_bcast_102",Pox_bcast_102,-2},
-	{"ox_reduce_102",Pox_reduce_102,3},
+	{"ox_reduce_102",Pox_reduce_102,-3},
 
 	{"try_bind_listen",Ptry_bind_listen,1},
 	{"try_connect",Ptry_connect,2},
@@ -299,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;
@@ -1006,18 +1020,15 @@ void Pox_bcast_102(NODE arg,Obj *rp)
 	int rank = QTOS((Q)ARG0(arg));
 	Obj data;
 
-	if ( rank == myrank_102 ) {
-		if ( argc(arg) == 1 ) 
-			error("ox_bcast_102 : data should be given at the root");
-		data = (Obj)ARG1(arg);
-	}
-	ox_bcast_102(rank,&data);
-	*rp = 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 rank = QTOS((Q)ARG0(arg));
+	int root = QTOS((Q)ARG0(arg));
 	STRING op;
 	char *opname;
 	void (*func)();
@@ -1032,7 +1043,10 @@ void Pox_reduce_102(NODE arg,Obj *rp)
 	else {
 		error("ox_reduce_102 : operation not supported");
 	}
-	ox_reduce_102(rank,func,(Obj)ARG2(arg),rp);
+	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)