=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.8 retrieving revision 1.16 diff -u -p -r1.8 -r1.16 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/03/10 03:05:02 1.8 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2000/08/22 05:04:18 1.16 @@ -1,4 +1,51 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.7 2000/02/09 00:37:21 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.15 2000/08/21 08:31:38 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "signal.h" @@ -9,8 +56,8 @@ #endif void ox_usr1_handler(); +int asir_ox_init(); - extern jmp_buf environnement; extern int do_message; @@ -18,7 +65,10 @@ 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; @@ -39,28 +89,37 @@ 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_cmd(int); static char *name_of_id(int); -static void asir_do_cmd(unsigned int,unsigned 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; @@ -87,7 +146,7 @@ static void create_error(ERR *err,unsigned int serial, void ox_main(int argc,char **argv) { int id; - unsigned int cmd; + int cmd; Obj obj; USINT ui; ERR err; @@ -157,7 +216,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; @@ -239,7 +298,7 @@ static char *name_of_id(int id) } } -static char *name_of_cmd(unsigned cmd) +static char *name_of_cmd(int cmd) { switch ( cmd ) { case SM_popSerializedLocalObject: @@ -646,7 +705,6 @@ static void ox_asir_init(int argc,char **argv) static void ox_io_init() { unsigned char c,rc; - extern int little_endian,ox_sock_id; endian_init(); #if defined(VISUAL) @@ -673,6 +731,8 @@ 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); } /* @@ -702,8 +762,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); @@ -717,19 +783,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) { 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 + } else { + asir_save_handler(); + asir_set_handler(); asir_do_cmd(cmd,0); + asir_reset_handler(); + } } /* @@ -746,12 +817,17 @@ void asir_ox_execute_string(char *s) MKSTR(str,s); asir_push_one((Obj)str); if ( ret = setjmp(env) ) { + asir_reset_handler(); if ( ret == 1 ) { create_error(&err,0,LastError); /* XXX */ asir_push_one((Obj)err); } - } else + } else { + asir_save_handler(); + asir_set_handler(); asir_executeString(); + asir_reset_handler(); + } } /* @@ -765,20 +841,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]; @@ -791,7 +869,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 @@ -842,26 +920,16 @@ 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; }