===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.43
retrieving revision 1.58
diff -u -p -r1.43 -r1.58
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2003/03/07 06:39:57	1.43
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2005/07/26 00:58:50	1.58
@@ -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.42 2003/03/07 03:12:28 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.57 2004/06/15 00:56:52 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -59,7 +59,10 @@ 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;
 extern int ox_flushing;
@@ -91,6 +94,12 @@ void asir_popString();
 void asir_popCMO(unsigned int);
 void asir_popSerializedLocalObject();
 void asir_pushCMOtag(unsigned int);
+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);
@@ -146,6 +155,9 @@ void ox_main(int argc,char **argv) {
 	if ( SETJMP(ox_env) ) {
 		while ( NEXT(asir_infile) )
 			closecurrentinput();
+		resetpvs();
+		reset_engine();
+		reset_io();
 		ox_send_sync(0);
 	}
 	while ( 1 ) {
@@ -176,6 +188,8 @@ void ox_main(int argc,char **argv) {
 					if ( ret == 1 ) {
 						create_error(&err,serial,LastError);
 						asir_push_one((Obj)err);
+						while ( NEXT(asir_infile) )
+							closecurrentinput();
 					}
 					break;
 				}
@@ -258,6 +272,24 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 		case SM_pushCMOtag:
 			asir_pushCMOtag(serial);
 			break;
+		case SM_set_rank_102:
+			asir_set_rank_102(serial);		
+			break;
+		case SM_tcp_accept_102:
+			asir_tcp_accept_102(serial);
+			break;
+		case SM_tcp_connect_102:
+			asir_tcp_connect_102(serial);
+			break;
+		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;
@@ -337,6 +369,23 @@ char *name_of_cmd(int cmd)
 			return "SM_nop";
 		case SM_pushCMOtag:
 			return "SM_pushCMOtag";
+		case SM_set_rank_102:
+			return "SM_set_rank_102";
+			break;
+		case SM_tcp_accept_102:
+			return "SM_tcp_accept_102";
+			break;
+		case SM_tcp_connect_102:
+			return "SM_tcp_connect_102";
+		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;
@@ -391,6 +440,144 @@ 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;
+	Obj obj;
+
+	for ( i = 0; i < myrank_102; i++ )
+		do {
+			ox_recv_102(i,&id,&obj);
+		} while ( id != OX_SYNC_BALL );
+	for ( i = myrank_102+1; i < nserver_102; i++ )
+		ox_send_sync_102(i);
+}
+
+void asir_set_rank_102(unsigned int serial)
+{
+	Obj obj;
+	Q rank,nserver;
+	int n,r,stat;
+	NODE arg;
+	ERR err;
+
+	rank = (Q)asir_pop_one();
+	nserver = (Q)asir_pop_one();
+	stat = 0;
+	if ( !nserver || !INT(nserver) || !INT(rank) ) {
+		stat = -1;
+	} else {
+		n = QTOS(nserver); r = QTOS(rank);
+		if ( n <= 0 || r < 0 || r >= n ) {
+			stat = -1;
+		}
+		myrank_102 = r;
+		nserver_102 = n;
+	}
+	if ( !stat ) return;
+	else {
+		create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102");
+		asir_push_one(obj);
+	}
+}
+
+void asir_tcp_accept_102(unsigned int serial)
+{
+	Obj obj;
+	Q r,p;
+	ERR err;
+	char port_str[BUFSIZ];
+	int port,s,use_unix,rank;
+
+	r = (Q)asir_pop_one();
+	p = (Q)asir_pop_one();
+	if ( IS_CYGWIN || !p || NUM(p) ) {
+		port = QTOS(p);
+		sprintf(port_str,"%d",port);
+		use_unix = 0;
+	} else {
+		strcpy(port_str,BDY((STRING)p));
+		use_unix = 1;
+	}
+	s = try_bind_listen(use_unix,port_str);
+	s = try_accept(use_unix,s);
+	rank = QTOS((Q)r);
+	if ( register_102(s,rank,1) < 0 ) {
+		create_error(&err,serial,
+			"failed to bind or accept in ox_tcp_accept_102");
+		asir_push_one((Obj)err);
+	}
+}
+
+void asir_tcp_connect_102(unsigned int serial)
+{
+	Obj obj;
+	Q r,p;
+	STRING h;
+	ERR err;
+	char *host;
+	char port_str[BUFSIZ];
+	int port,s,use_unix,rank;
+
+	r = (Q)asir_pop_one();
+	p = (Q)asir_pop_one();
+	h = (STRING)asir_pop_one();
+	if ( IS_CYGWIN || !p || NUM(p) ) {
+		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;
+	}
+	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 connect in ox_tcp_connect_102");
+		asir_push_one((Obj)err);
+	}
+}
+
 void asir_pushCMOtag(unsigned int serial)
 {
 	Obj obj;
@@ -411,23 +598,20 @@ void asir_pushCMOtag(unsigned int serial)
 void asir_popString()
 {
 	Obj val;
-	char *buf,*obuf;
+	char *buf;
 	int l;
 	STRING str;
 
 	val = asir_pop_one();
 	if ( !val )
-		obuf = "0";
+		buf = "0";
 	else {
 		l = estimate_length(CO,val);
 		buf = (char *)ALLOCA(l+1);
 		soutput_init(buf);
 		sprintexpr(CO,val);
-		l = strlen(buf);
-		obuf = (char *)MALLOC(l+1);
-		strcpy(obuf,buf);
 	}
-	MKSTR(str,obuf);
+	MKSTR(str,buf);
 	ox_send_data(0,str);
 }
 
@@ -482,6 +666,20 @@ void asir_evalName(unsigned int serial)
 	asir_push_one(val);
 }
 
+char *augment_backslash(char *s)
+{
+	char *p,*r;
+	int i;
+
+	for ( i = 0, p = s; *p; p++, i++ ) if ( *p == '\\' ) i++;
+	r = (char *)MALLOC_ATOMIC((i+1)*sizeof(char));
+	for ( i = 0, p = s; *p; p++, i++ ) {
+		if ( *p == '\\' ) r[i++] = '\\';
+		r[i] = *p;
+	}
+	return r;
+}
+
 int asir_executeString()
 {
 	SNODE snode;
@@ -490,13 +688,20 @@ 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;
+/* XXX : probably this is useless */
+#if 0
+	parse_strp = augment_backslash(cmd);
+#else
 	parse_strp = cmd;
+#endif
 	if ( mainparse(&snode) ) {
 		return -1;
 	}
@@ -653,6 +858,7 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	int tmp;
 #endif
 
+	GC_init();
 #if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 1; /* XXX */
 #endif
@@ -665,7 +871,7 @@ void ox_asir_init(int argc,char **argv,char *servernam
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
+	cppname_init();
 	process_args(--argc,++argv);
 #if defined(__CYGWIN__)
 	if ( !displayname[0] )
@@ -941,6 +1147,7 @@ int asir_ox_init(int byteorder)
 	static ox_asir_initialized = 0;
 	FILE *ifp;
 
+	GC_init();
 #if !defined(VISUAL) && !defined(MPI)
 	do_server_in_X11 = 0; /* XXX */
 #endif
@@ -953,7 +1160,6 @@ int asir_ox_init(int byteorder)
 	rtime_init();
 	env_init();
 	endian_init();
-	GC_init();
 /*	process_args(argc,argv); */
 	output_init();
 	arf_init();