===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.46
retrieving revision 1.52
diff -u -p -r1.46 -r1.52
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2003/12/10 02:16:08	1.46
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2004/02/26 06:37:09	1.52
@@ -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_asir.c,v 1.45 2003/12/09 03:07:45 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.51 2004/02/13 05:48:36 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -59,7 +59,9 @@ void ox_usr1_handler();
 int asir_ox_init();
 
 /* environement is defined in libpari.a */
+# if !( PARI_VERSION_CODE > 131588)
 extern jmp_buf environnement;
+# endif
 extern int myrank_102,nserver_102;
 
 extern int do_message;
@@ -96,6 +98,8 @@ void asir_set_rank_102(unsigned int);
 void asir_tcp_accept_102(unsigned int);
 void asir_tcp_connect_102(unsigned int);
 void asir_reset_102(unsigned int serial);
+void asir_bcast_102(unsigned int serial);
+void asir_reduce_102(unsigned int serial);
 LIST asir_GetErrorList();
 char *name_of_cmd(int);
 char *name_of_id(int);
@@ -275,6 +279,12 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 		case SM_reset_102:
 			asir_reset_102(serial);
 			break;
+		case SM_bcast_102:
+			asir_bcast_102(serial);
+			break;
+		case SM_reduce_102:
+			asir_reduce_102(serial);
+			break;
 		case SM_nop:
 		default:
 			break;
@@ -365,6 +375,12 @@ char *name_of_cmd(int cmd)
 		case SM_reset_102:
 			return "SM_reset_102";
 			break;
+		case SM_bcast_102:
+			return "SM_bcast_102";
+			break;
+		case SM_reduce_102:
+			return "SM_reduce_102";
+			break;
 		default:
 			return "Unknown cmd";
 			break;
@@ -419,6 +435,43 @@ void asir_popCMO(unsigned int serial)
 	}
 }
 
+void asir_reduce_102(unsigned int serial)
+{
+	Q r;
+	int root;
+	Obj data,obj;
+	ERR err;
+	STRING op;
+	char *opname;
+	void (*func)();
+
+	func = 0;
+	op = (STRING)asir_pop_one();
+	opname = BDY(op);
+	r = (Q)asir_pop_one();
+	root = QTOS(r);
+	if ( !strcmp(opname,"+") )
+		func = arf_add;
+	else if ( !strcmp(opname,"*") )
+		func = arf_mul;
+	if ( !func ) {
+		create_error(&err,serial,"Invalid opration in ox_reduce_102");
+		asir_push_one(obj);
+	} else
+		ox_reduce_102(root,func);
+}
+
+void asir_bcast_102(unsigned int serial)
+{
+	Q r;
+	int root;
+	Obj data;
+
+	r = (Q)asir_pop_one();
+	root = QTOS(r);
+	ox_bcast_102(root);
+}
+
 void asir_reset_102(unsigned int serial)
 {
 	int i,j,id;
@@ -428,12 +481,10 @@ void asir_reset_102(unsigned int serial)
 		do {
 			ox_recv_102(i,&id,&obj);
 		} while ( id != OX_SYNC_BALL );
-	for ( i = myrank_102; i < nserver_102; i++ )
+	for ( i = myrank_102+1; i < nserver_102; i++ )
 		ox_send_sync_102(i);
 }
 
-extern int myrank_102,nserver_102;
-
 void asir_set_rank_102(unsigned int serial)
 {
 	Obj obj;
@@ -507,16 +558,17 @@ void asir_tcp_connect_102(unsigned int serial)
 		port = QTOS(p);
 		sprintf(port_str,"%d",port);
 		use_unix = 0;
+		host = BDY((STRING)h);
 	} else {
 		strcpy(port_str,BDY((STRING)p));
 		use_unix = 1;
+		host = 0;
 	}
-	host = BDY((STRING)h);
 	s = try_connect(use_unix,host,port_str);
 	rank = QTOS((Q)r);
 	if ( register_102(s,rank,1) < 0 ) {
 		create_error(&err,serial,
-			"failed to bind or accept in ox_tcp_connect_102");
+			"failed to connect in ox_tcp_connect_102");
 		asir_push_one((Obj)err);
 	}
 }
@@ -553,11 +605,13 @@ void asir_popString()
 		buf = (char *)ALLOCA(l+1);
 		soutput_init(buf);
 		sprintexpr(CO,val);
+#if 0
 		l = strlen(buf);
 		obuf = (char *)MALLOC(l+1);
 		strcpy(obuf,buf);
+#endif
 	}
-	MKSTR(str,obuf);
+	MKSTR(str,buf);
 	ox_send_data(0,str);
 }
 
@@ -620,10 +674,12 @@ int asir_executeString()
 #if defined(PARI)
 	recover(0);
 	/* environement is defined in libpari.a */
+# if !(PARI_VERSION_CODE > 131588 )
 	if ( setjmp(environnement) ) {
 		avma = top; recover(1);
 		resetenv("");
 	}
+# endif
 #endif
 	cmd = ((STRING)asir_pop_one())->body;
 	parse_strp = cmd;