===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2000/03/19 12:35:20	1.13
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2000/09/12 06:05:30	1.19
@@ -1,4 +1,51 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.12 2000/03/16 08:23:16 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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.18 2000/09/07 23:59:55 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include "signal.h"
@@ -23,14 +70,16 @@ extern int little_endian,ox_sock_id;
 int ox_sock_id;
 int lib_ox_need_conv;
 
+void create_error(ERR *,unsigned int ,char *);
+
 static int asir_OperandStackSize;
 static Obj *asir_OperandStack;
 static int asir_OperandStackPtr = -1;
 
-static void create_error(ERR *,unsigned int ,char *);
 static void ox_io_init();
 static void ox_asir_init(int,char **);
 static Obj asir_pop_one();
+static Obj asir_peek_one();
 static void asir_push_one(Obj);
 static void asir_end_flush();
 static void asir_executeFunction(int);
@@ -41,53 +90,45 @@ static void asir_pops();
 static void asir_popString();
 static void asir_popCMO(unsigned int);
 static void asir_popSerializedLocalObject();
+static void asir_pushCMOtag(unsigned int);
 static LIST asir_GetErrorList();
 static char *name_of_cmd(int);
 static char *name_of_id(int);
 static void asir_do_cmd(int,unsigned int);
 
 #if MPI
+/* XXX : currently MPI version supports only a homogeneous cluster. */
+
 extern int mpi_nprocs,mpi_myid;
 
 void ox_mpi_master_init() {
-	int i,idx,ret;
+	int i,idx;
 
-	for ( i = 1; i < mpi_nprocs; i++ ) {
-		/* client mode */
+	for ( i = 0; i < mpi_nprocs; i++ ) {
+		/* ordering information is not exchanged */
+		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		ret = register_server(0,idx,idx);
+		register_server(0,idx,idx);
 	}
 }
 
 void ox_mpi_slave_init() {
+	int i,idx;
+
 	endian_init();
-	/* server mode */
-	get_iofp(0,0,1);
 	fclose(stdin);
+	for ( i = 0; i < mpi_nprocs; i++ ) {
+		/* ordering information is not exchanged */
+		/* idx should be equal to i */
+		idx = get_iofp(i,0,0);
+		register_server(0,idx,idx);
+	}
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
 	asir_OperandStackPtr = -1;
 }
 #endif
 
-static void create_error(ERR *err,unsigned int serial,char *msg)
-{
-	int len;
-	USINT ui;
-	NODE n,n1;
-	LIST list;
-	char *msg1;
-	STRING errmsg;
-
-	MKUSINT(ui,serial);
-	len = strlen(msg);
-	msg1 = (char *)MALLOC(len+1);
-	strcpy(msg1,msg);
-	MKSTR(errmsg,msg1);
-	MKNODE(n1,errmsg,0); MKNODE(n,ui,n1); MKLIST(list,n);
-	MKERR(*err,list);
-}
-
 void ox_main(int argc,char **argv) {
 	int id;
 	int cmd;
@@ -215,6 +256,9 @@ static void asir_do_cmd(int cmd,unsigned int serial)
 			client_mathcap = (MATHCAP)asir_pop_one();
 			store_remote_mathcap(0,client_mathcap);
 			break;
+		case SM_pushCMOtag:
+			asir_pushCMOtag(serial);
+			break;
 		case SM_nop:
 		default:
 			break;
@@ -292,6 +336,8 @@ static char *name_of_cmd(int cmd)
 			break;
 		case SM_nop:
 			return "SM_nop";
+		case SM_pushCMOtag:
+			return "SM_pushCMOtag";
 		default:
 			return "Unknown cmd";
 			break;
@@ -346,6 +392,23 @@ static void asir_popCMO(unsigned int serial)
 	}
 }
 
+static void asir_pushCMOtag(unsigned int serial)
+{
+	Obj obj;
+	ERR err;
+	USINT ui;
+	int tag;
+
+	obj = asir_peek_one();
+	if ( cmo_tag(obj,&tag) ) {
+		MKUSINT(ui,tag);
+		asir_push_one((Obj)ui);
+	} else {
+		create_error(&err,serial,"cannot convert to CMO object");
+		asir_push_one((Obj)err);
+	}
+}
+
 static void asir_popString()
 {
 	Obj val;
@@ -563,6 +626,18 @@ static Obj asir_pop_one() {
 	}
 }
 
+static Obj asir_peek_one() {
+	if ( asir_OperandStackPtr < 0 ) {
+		if ( do_message )
+			fprintf(stderr,"OperandStack underflow");
+		return 0;
+	} else {
+		if ( do_message )
+			fprintf(stderr,"peek at %d\n",asir_OperandStackPtr);
+		return asir_OperandStack[asir_OperandStackPtr];
+	}
+}
+
 static void ox_asir_init(int argc,char **argv)
 {
 	int tmp;
@@ -675,8 +750,11 @@ static void ox_io_init() {
 	write_char(iofp[0].out,&c); ox_flush_stream_force(0);
 	read_char(iofp[0].in,&rc);
 	iofp[0].conv = c == rc ? 0 : 1;
+	/* XXX; for raw I/O */
+	register_server(0,0,0);
 }
 
+#if !defined(VISUAL)
 /*
  * Library mode functions
  */
@@ -875,3 +953,4 @@ int asir_ox_init(int byteorder)
 	asir_reset_handler();
 	return 0;
 }
+#endif