===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM_contrib2/asir2000/io/ox.c	2003/12/10 05:39:58	1.22
+++ OpenXM_contrib2/asir2000/io/ox.c	2004/12/17 03:09:08	1.26
@@ -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/ox.c,v 1.21 2003/12/09 03:07:45 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.25 2004/08/28 12:50:30 takayama Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -120,6 +120,7 @@ static int available_cmo[] = {
 	CMO_ZZ, CMO_QQ, CMO_ZERO,
 	CMO_DMS_GENERIC, CMO_DMS_OF_N_VARIABLES,
 	CMO_RING_BY_NAME, CMO_DISTRIBUTED_POLYNOMIAL,
+    CMO_RATIONAL,
 	CMO_RECURSIVE_POLYNOMIAL, CMO_UNIVARIATE_POLYNOMIAL,
 	CMO_INDETERMINATE,
 	CMO_TREE,
@@ -146,6 +147,7 @@ static int ox_asir_available_sm[] = {
 	SM_mathcap, SM_setMathcap, SM_nop,
 	SM_beginBlock, SM_endBlock,
 	SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102,
+	SM_bcast_102, SM_reduce_102,
 	0
 };
 
@@ -402,10 +404,12 @@ void end_critical() {
 	}
 }
 
-extern FUNC registered_handler;
+extern NODE user_int_handler;
 
 void ox_usr1_handler(int sig)
 {
+	NODE t;
+
 #if !defined(VISUAL)
 	signal(SIGUSR1,ox_usr1_handler);
 #endif
@@ -414,10 +418,11 @@ void ox_usr1_handler(int sig)
 		ox_usr1_sent = 1;
 	} else {
 		ox_flushing = 1;
-		if ( registered_handler ) {
+		if ( user_int_handler ) {
 			fprintf(stderr,
-				"usr1 : calling the registered exception handler...");
-			bevalf(registered_handler,0);
+				"usr1 : calling the registered exception handlers...");
+			for ( t = user_int_handler; t; t = NEXT(t) )
+				bevalf((FUNC)BDY(t),0);
 			fprintf(stderr, "done.\n");
 		}
 		ox_resetenv("usr1 : return to toplevel by SIGUSR1");
@@ -532,30 +537,58 @@ void ox_send_data_102(int rank,pointer p)
 	end_critical();
 }
 
-void ox_bcast_102(int root,Obj *rp)
+void ox_bcast_102(int root)
 {
 	Obj data;
-	int n,myr,r,mask,src,dst,id;
+	int r,mask,id,src,dst;
 
-	data = *rp;
-	n = nserver_102;
-	myr = myrank_102;
-	r = myr-root;
-	if ( r < 0 ) r += n;
-	for ( mask = 1; mask < n; mask <<= 1 )
+	r = myrank_102-root;
+	if ( r == 0 )
+		data = (Obj)asir_pop_one();
+		
+	if ( r < 0 ) r += nserver_102;
+	for ( mask = 1; mask < nserver_102; mask <<= 1 )
 		if ( r&mask ) {
-			src = myr-mask;
-			if ( src < 0 ) src += n;
+			src = myrank_102-mask;
+			if ( src < 0 ) src += nserver_102;
 			ox_recv_102(src,&id,&data);
 			break;
 		}
 	for ( mask >>= 1; mask > 0; mask >>= 1 )
-		if ( (r+mask) < n ) {
-			dst = myr+mask;
-			if ( dst >= n ) dst -= n;
+		if ( (r+mask) < nserver_102 ) {
+			dst = myrank_102+mask;
+			if ( dst >= nserver_102 ) dst -= nserver_102;
 			ox_send_data_102(dst,data);
 		}
-	*rp = data;
+	asir_push_one(data);
+}
+
+/* func : an arithmetic funcion func(vl,a,b,*c) */
+
+void ox_reduce_102(int root,void (*func)())
+{
+	Obj data,data0,t;
+	int r,mask,id,src,dst;
+
+	r = myrank_102-root;
+	if ( r < 0 ) r += nserver_102;
+	data = (Obj)asir_pop_one();
+	for ( mask = 1; mask < nserver_102; mask <<= 1 )
+		if ( r&mask ) {
+			dst = (r-mask)+root;
+			if ( dst >= nserver_102 ) dst -= nserver_102;
+			ox_send_data_102(dst,data);
+			break;
+		} else {
+			src = r+mask;
+			if ( src < nserver_102 ) {
+				src += root;
+				if ( src >= nserver_102 ) src -= nserver_102;
+				ox_recv_102(src,&id,&data0);
+				(*func)(CO,data,data0,&t); data = t;
+			}
+		}
+	asir_push_one(r?0:data);
 }
 
 void ox_send_cmd(int s,int id)