===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.23
retrieving revision 1.27
diff -u -p -r1.23 -r1.27
--- OpenXM_contrib2/asir2000/io/ox.c	2003/12/10 07:37:40	1.23
+++ OpenXM_contrib2/asir2000/io/ox.c	2006/02/08 02:11:19	1.27
@@ -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.22 2003/12/10 05:39:58 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.26 2004/12/17 03:09:08 noro 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");
@@ -509,7 +514,7 @@ void ox_send_data(int s,pointer p)
 	ERR err;
 
 	if ( ox_check && !ox_check_cmo(s,(Obj)p) ) {
-		create_error(&err,ox_serial,"ox_send_data : Mathcap violation");
+		create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0);
 		p = (pointer)err;
 	}
 	begin_critical();
@@ -532,13 +537,15 @@ 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 r,mask,id,src,dst;
 
-	data = *rp;
 	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 ) {
@@ -553,18 +560,19 @@ void ox_bcast_102(int root,Obj *rp)
 			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,Obj *rp)
+void ox_reduce_102(int root,void (*func)())
 {
-	Obj data0,t;
+	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;
@@ -580,10 +588,7 @@ void ox_reduce_102(int root,void (*func)(),Obj data,Ob
 				(*func)(CO,data,data0,&t); data = t;
 			}
 		}
-	if ( !r )
-		*rp = data;
-	else
-		*rp = 0;
+	asir_push_one(r?0:data);
 }
 
 void ox_send_cmd(int s,int id)