=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.2 retrieving revision 1.32 diff -u -p -r1.2 -r1.32 --- OpenXM_contrib2/asir2000/io/ox_asir.c 1999/12/22 07:01:39 1.2 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2001/10/09 01:36:21 1.32 @@ -1,10 +1,62 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.1.1.1 1999/12/03 07:39:11 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.31 2001/10/06 00:55:04 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,81 +65,76 @@ 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; - LIST list; - NODE n,n1; unsigned int serial; int ret; extern char LastError[]; @@ -124,7 +171,7 @@ void ox_main(int argc,char **argv) { break; if ( do_message ) fprintf(stderr," %s\n",name_of_cmd(cmd)); - if ( ret = setjmp(env) ) { + if ( ret = setjmp(main_env) ) { if ( ret == 1 ) { create_error(&err,serial,LastError); asir_push_one((Obj)err); @@ -152,7 +199,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 +254,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 +284,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 +334,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 +359,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -323,7 +375,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 +390,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; @@ -347,7 +416,7 @@ static void asir_popString() val = asir_pop_one(); if ( !val ) - obuf = 0; + obuf = "0"; else { l = estimate_length(CO,val); buf = (char *)ALLOCA(l+1); @@ -361,7 +430,7 @@ static void asir_popString() ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -369,7 +438,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 +460,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 +481,7 @@ static void asir_evalName(unsigned int serial) asir_push_one(val); } -static int asir_executeString() +int asir_executeString() { SNODE snode; pointer val; @@ -450,17 +519,27 @@ static void asir_executeFunction(int serial) int argc; FUNC f; Obj result; - VL vl; NODE n,n1; STRING fname; char *path; - USINT ui; ERR err; + Obj arg; static char buf[BUFSIZ]; - func = ((STRING)asir_pop_one())->body; - argc = (int)(((USINT)asir_pop_one())->body); + arg = asir_pop_one(); + if ( !arg || OID(arg) != O_STR ) { + sprintf(buf,"executeFunction : invalid function name"); + goto error; + } else + func = ((STRING)arg)->body; + arg = asir_pop_one(); + if ( !arg || OID(arg) != O_USINT ) { + sprintf(buf,"executeFunction : invalid argc"); + goto error; + } else + argc = (int)(((USINT)arg)->body); + for ( n = 0; argc; argc-- ) { NEXTNODE(n,n1); BDY(n1) = (pointer)asir_pop_one(); @@ -491,16 +570,21 @@ static void asir_executeFunction(int serial) searchf(usrf,func,&f); if ( !f ) { sprintf(buf,"executeFunction : the function %s not found",func); - create_error(&err,serial,buf); - result = (Obj)err; + goto error; } else { result = (Obj)bevalf(f,n); } } asir_push_one(result); + return; + +error: + create_error(&err,serial,buf); + result = (Obj)err; + asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -512,7 +596,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++; @@ -526,7 +610,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"); @@ -538,9 +622,20 @@ 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]; extern int GC_dont_gc; extern int read_exec_file; @@ -549,6 +644,11 @@ static void ox_asir_init(int argc,char **argv) char *getenv(); static ox_asir_initialized = 0; FILE *ifp; + char *homedir; + char *ptr; +#if !defined(VISUAL) + int tmp; +#endif #if !defined(VISUAL) && !MPI do_server_in_X11 = 1; /* XXX */ @@ -559,16 +659,9 @@ static void ox_asir_init(int argc,char **argv) #endif srandom((int)get_current_time()); -#if defined(THINK_C) - param_init(); -#endif - StackBottom = &tmp + 1; /* XXX */ rtime_init(); env_init(); endian_init(); -#if !defined(VISUAL) && !defined(THINK_C) -/* check_key(); */ -#endif GC_init(); process_args(--argc,++argv); output_init(); @@ -587,14 +680,22 @@ static void ox_asir_init(int argc,char **argv) #if defined(UINIT) reg_sysf(); #endif -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else - sprintf(ifname,"%s/.asirrc",getenv("HOME")); -#endif +/* if ASIR_CONFIG is set, execute it; else execute .asirrc */ + if ( ptr = getenv("ASIR_CONFIG") ) + strcpy(ifname,ptr); + else { + homedir = getenv("HOME"); + if ( !homedir ) { + char rootname[BUFSIZ]; + + get_rootdir(rootname,sizeof(rootname)); + homedir = rootname; + } + sprintf(ifname,"%s/.asirrc",homedir); + } if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { input_init(ifp,ifname); - if ( !setjmp(env) ) { + if ( !setjmp(main_env) ) { read_exec_file = 1; read_eval_loop(); read_exec_file = 0; @@ -602,16 +703,36 @@ static void ox_asir_init(int argc,char **argv) fclose(ifp); } input_init(0,"string"); -#if !MPI +/* XXX Windows compatibility */ ox_io_init(); -#endif 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; + /* XXX : ssh forwards stdin to a remote host */ +#if !defined(VISUAL) + int i; +#if defined(linux) || defined(__NeXT__) || defined(ultrix) +#include + + close(0); + for ( i = 5; i < NOFILE; i++ ) + close(i); +#else +#include + struct rlimit rl; + + getrlimit(RLIMIT_NOFILE,&rl); + close(0); + for ( i = 5; i < rl.rlim_cur; i++ ) + close(i); +#endif +#endif + + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -637,4 +758,220 @@ 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 + */ + +/* + * Converts a binary encoded CMO into a risa object + * and pushes it onto the stack. + */ + +void asir_ox_push_cmo(void *cmo) +{ + Obj obj; + + ox_copy_init(cmo); + ox_buf_to_obj_as_cmo(&obj); + asir_push_one(obj); +} + +/* + * Pop an object from the stack and converts it + * into a binary encoded CMO. + */ + +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); + ox_obj_to_buf_as_cmo(obj); + return len; + } else + return -1; +} + +int asir_ox_pop_string(void *string, int limit) +{ + Obj val; + int l; + + val = asir_pop_one(); + if ( !val ) { + if ( limit >= 2 ) { + sprintf(string,"0"); + l = strlen(string); + } else + l = -1; + } else { + l = estimate_length(CO,val); + if ( l+1 <= limit ) { + soutput_init(string); + sprintexpr(CO,val); + l = strlen(string); + } else + l = -1; + } + return l; +} + +/* + * Executes an SM command. + */ + +void asir_ox_push_cmd(int cmd) +{ + int ret; + ERR err; + extern char LastError[]; + + if ( ret = setjmp(main_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(); + } +} + +/* + * Executes a string written in Asir. + */ + +void asir_ox_execute_string(char *s) +{ + STRING str; + int ret; + ERR err; + extern char LastError[]; + + MKSTR(str,s); + asir_push_one((Obj)str); + if ( ret = setjmp(main_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(); + } +} + +/* + * Returns the size as a CMO of the object + * at the top of the stack. + */ + +int asir_ox_peek_cmo_size() +{ + Obj obj; + int len; + + obj = asir_pop_one(); + 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=0 => native + * =1 => network byte order + */ + +int asir_ox_init(int byteorder) +{ + int tmp; + char ifname[BUFSIZ]; + extern int GC_dont_gc; + extern int read_exec_file; + extern int do_asirrc; + extern int do_server_in_X11; + char *getenv(); + static ox_asir_initialized = 0; + FILE *ifp; + +#if !defined(VISUAL) && !MPI + do_server_in_X11 = 0; /* XXX */ +#endif + asir_save_handler(); +#if PARI + risa_pari_init(); +#endif + srandom((int)get_current_time()); + + rtime_init(); + env_init(); + endian_init(); + GC_init(); +/* process_args(argc,argv); */ + output_init(); + arf_init(); + nglob_init(); + glob_init(); + sig_init(); + tty_init(); + debug_init(); + pf_init(); + sysf_init(); + parif_init(); +#if defined(VISUAL) + init_socket(); +#endif +#if defined(UINIT) + reg_sysf(); +#endif + sprintf(ifname,"%s/.asirrc",getenv("HOME")); + if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { + input_init(ifp,ifname); + if ( !setjmp(main_env) ) { + read_exec_file = 1; + read_eval_loop(); + read_exec_file = 0; + } + fclose(ifp); + } + input_init(0,"string"); + + asir_OperandStackSize = BUFSIZ; + asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); + asir_OperandStackPtr = -1; + if ( little_endian && byteorder ) + lib_ox_need_conv = 1; + else + lib_ox_need_conv = 0; + do_message = 0; + create_my_mathcap("ox_asir"); + asir_reset_handler(); + return 0; +} +#endif