=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.14 retrieving revision 1.21 diff -u -p -r1.14 -r1.21 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/07/13 05:09:02 1.14 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2000/11/07 06:35:38 1.21 @@ -1,4 +1,51 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.13 2000/03/19 12:35:20 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.20 2000/10/06 06:05:22 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "signal.h" @@ -23,28 +70,32 @@ extern int little_endian,ox_sock_id; int ox_sock_id; int lib_ox_need_conv; -static int asir_OperandStackSize; -static Obj *asir_OperandStack; -static int asir_OperandStackPtr = -1; +void create_error(ERR *,unsigned int ,char *); -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 void asir_push_one(Obj); -static void asir_end_flush(); -static void asir_executeFunction(int); -static int asir_executeString(); -static void asir_evalName(unsigned int); -static void asir_setName(unsigned int); -static void asir_pops(); -static void asir_popString(); -static void asir_popCMO(unsigned int); -static void asir_popSerializedLocalObject(); -static LIST asir_GetErrorList(); -static char *name_of_cmd(int); -static char *name_of_id(int); +int asir_OperandStackSize; +Obj *asir_OperandStack; +int asir_OperandStackPtr = -1; + +void ox_io_init(); +void ox_asir_init(int,char **); +Obj asir_pop_one(); +Obj asir_peek_one(); +void asir_push_one(Obj); +void asir_end_flush(); +int asir_executeString(); +void asir_evalName(unsigned int); +void asir_setName(unsigned int); +void asir_pops(); +void asir_popString(); +void asir_popCMO(unsigned int); +void asir_popSerializedLocalObject(); +void asir_pushCMOtag(unsigned int); +LIST asir_GetErrorList(); +char *name_of_cmd(int); +char *name_of_id(int); + static void asir_do_cmd(int,unsigned int); +static void asir_executeFunction(int); #if MPI /* XXX : currently MPI version supports only a homogeneous cluster. */ @@ -79,24 +130,6 @@ void ox_mpi_slave_init() { } #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; @@ -224,13 +257,16 @@ 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; } } -static char *name_of_id(int id) +char *name_of_id(int id) { switch ( id ) { case OX_COMMAND: @@ -251,7 +287,7 @@ static char *name_of_id(int id) } } -static char *name_of_cmd(int cmd) +char *name_of_cmd(int cmd) { switch ( cmd ) { case SM_popSerializedLocalObject: @@ -301,13 +337,15 @@ 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; } } -static LIST asir_GetErrorList() +LIST asir_GetErrorList() { int i; NODE n,n0; @@ -324,7 +362,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -340,7 +378,7 @@ static void asir_popSerializedLocalObject() ox_send_cmd(0,SM_endBlock); } -static void asir_popCMO(unsigned int serial) +void asir_popCMO(unsigned int serial) { Obj obj; ERR err; @@ -355,8 +393,25 @@ static void asir_popCMO(unsigned int serial) } } -static void asir_popString() +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); + } +} + +void asir_popString() +{ Obj val; char *buf,*obuf; int l; @@ -378,7 +433,7 @@ static void asir_popString() ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -386,7 +441,7 @@ static void asir_pops() asir_OperandStackPtr = MAX(asir_OperandStackPtr-n,-1); } -static void asir_setName(unsigned int serial) +void asir_setName(unsigned int serial) { char *name; int l,n; @@ -408,7 +463,7 @@ static void asir_setName(unsigned int serial) } } -static void asir_evalName(unsigned int serial) +void asir_evalName(unsigned int serial) { char *name; int l,n; @@ -429,7 +484,7 @@ static void asir_evalName(unsigned int serial) asir_push_one(val); } -static int asir_executeString() +int asir_executeString() { SNODE snode; pointer val; @@ -534,7 +589,7 @@ error: asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -546,7 +601,7 @@ static void asir_end_flush() */ -static void asir_push_one(Obj obj) +void asir_push_one(Obj obj) { if ( !obj || OID(obj) != O_VOID ) { asir_OperandStackPtr++; @@ -560,7 +615,7 @@ static void asir_push_one(Obj obj) } } -static Obj asir_pop_one() { +Obj asir_pop_one() { if ( asir_OperandStackPtr < 0 ) { if ( do_message ) fprintf(stderr,"OperandStack underflow"); @@ -572,7 +627,19 @@ static Obj asir_pop_one() { } } -static void ox_asir_init(int argc,char **argv) +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]; + } +} + +void ox_asir_init(int argc,char **argv) { int tmp; char ifname[BUFSIZ]; @@ -656,9 +723,11 @@ static void ox_asir_init(int argc,char **argv) create_my_mathcap("ox_asir"); } -static void ox_io_init() { +void ox_io_init() { unsigned char c,rc; + extern int I_am_server; + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -688,6 +757,7 @@ static void ox_io_init() { register_server(0,0,0); } +#if !defined(VISUAL) /* * Library mode functions */ @@ -886,3 +956,4 @@ int asir_ox_init(int byteorder) asir_reset_handler(); return 0; } +#endif