=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.5 retrieving revision 1.22 diff -u -p -r1.5 -r1.22 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/01/31 03:18:05 1.5 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2000/11/14 08:38:39 1.22 @@ -1,10 +1,62 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.4 2000/01/19 09:31:00 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.21 2000/11/07 06:35:38 noro Exp $ +*/ #include "ca.h" #include "parse.h" +#include "signal.h" #include "ox.h" #include "version.h" +#if PARI +#include "genpari.h" +#endif void ox_usr1_handler(); +int asir_ox_init(); extern jmp_buf environnement; @@ -13,76 +65,74 @@ extern int ox_flushing; extern jmp_buf ox_env; extern MATHCAP my_mathcap; +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(); +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); -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(unsigned int); -static char *name_of_id(int); -static void asir_do_cmd(unsigned 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; - unsigned int cmd; + int cmd; Obj obj; USINT ui; ERR err; @@ -152,7 +202,7 @@ void ox_main(int argc,char **argv) { } } -static void asir_do_cmd(unsigned int cmd,unsigned int serial) +static void asir_do_cmd(int cmd,unsigned int serial) { MATHCAP client_mathcap; Q q; @@ -207,13 +257,16 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 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: @@ -234,7 +287,7 @@ static char *name_of_id(int id) } } -static char *name_of_cmd(unsigned cmd) +char *name_of_cmd(int cmd) { switch ( cmd ) { case SM_popSerializedLocalObject: @@ -284,13 +337,15 @@ static char *name_of_cmd(unsigned 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; @@ -307,7 +362,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -323,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; @@ -338,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; @@ -361,7 +433,7 @@ static void asir_popString() ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -369,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; @@ -391,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; @@ -412,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; @@ -517,7 +589,7 @@ error: asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -529,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++; @@ -543,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"); @@ -555,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]; @@ -581,7 +665,6 @@ static void ox_asir_init(int argc,char **argv) #if defined(THINK_C) param_init(); #endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); @@ -639,10 +722,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 little_endian,ox_sock_id; + extern int I_am_server; + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -668,8 +752,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 */ @@ -697,8 +784,14 @@ int asir_ox_pop_cmo(void *cmo, int limit) { Obj obj; int len; + ERR err; obj = asir_pop_one(); + if ( !valid_as_cmo(obj) ) { + asir_push_one(obj); + create_error(&err,0,"The object at the stack top is invalid as a CMO."); + obj = (Obj)err; + } len = count_as_cmo(obj); if ( len <= limit ) { ox_copy_init(cmo); @@ -712,9 +805,24 @@ int asir_ox_pop_cmo(void *cmo, int limit) * Executes an SM command. */ -void asir_ox_push_cmd(unsigned int cmd) +void asir_ox_push_cmd(int cmd) { - asir_do_cmd(cmd,0); + int ret; + ERR err; + extern char LastError[]; + + if ( ret = setjmp(env) ) { + asir_reset_handler(); + if ( ret == 1 ) { + create_error(&err,0,LastError); /* XXX */ + asir_push_one((Obj)err); + } + } else { + asir_save_handler(); + asir_set_handler(); + asir_do_cmd(cmd,0); + asir_reset_handler(); + } } /* @@ -724,10 +832,24 @@ void asir_ox_push_cmd(unsigned int cmd) void asir_ox_execute_string(char *s) { STRING str; + int ret; + ERR err; + extern char LastError[]; MKSTR(str,s); asir_push_one((Obj)str); - asir_executeString(); + if ( ret = setjmp(env) ) { + asir_reset_handler(); + if ( ret == 1 ) { + create_error(&err,0,LastError); /* XXX */ + asir_push_one((Obj)err); + } + } else { + asir_save_handler(); + asir_set_handler(); + asir_executeString(); + asir_reset_handler(); + } } /* @@ -741,20 +863,22 @@ int asir_ox_peek_cmo_size() int len; obj = asir_pop_one(); - len = count_as_cmo(obj); asir_push_one(obj); + if ( !valid_as_cmo(obj) ) { + fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); + return 0; + } + len = count_as_cmo(obj); return len; } /* * Initialization. - * byteorder = 1 : little endian - * 0 : big endian + * byteorder=0 => native + * =1 => network byte order */ -void asir_ox_io_init(); - -void asir_ox_init(int byteorder) +int asir_ox_init(int byteorder) { int tmp; char ifname[BUFSIZ]; @@ -767,7 +891,7 @@ void asir_ox_init(int byteorder) FILE *ifp; #if !defined(VISUAL) && !MPI - do_server_in_X11 = 1; /* XXX */ + do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); #if PARI @@ -778,7 +902,6 @@ void asir_ox_init(int byteorder) #if defined(THINK_C) param_init(); #endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); @@ -818,26 +941,17 @@ void asir_ox_init(int byteorder) fclose(ifp); } input_init(0,"string"); - asir_ox_io_init(byteorder); - create_my_mathcap("ox_asir"); -} -void asir_ox_io_init(byteorder) -int byteorder; -{ - unsigned char c; - extern int little_endian; - extern int lib_ox_initialized; - - endian_init(); asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); asir_OperandStackPtr = -1; - if ( little_endian ) - c = 1; + if ( little_endian && byteorder ) + lib_ox_need_conv = 1; else - c = 0; - iofp[0].conv = c == byteorder ? 0 : 1; - lib_ox_initialized = 1; + lib_ox_need_conv = 0; do_message = 0; + create_my_mathcap("ox_asir"); + asir_reset_handler(); + return 0; } +#endif