=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.15 retrieving revision 1.42 diff -u -p -r1.15 -r1.42 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/08/21 08:31:38 1.15 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2003/03/07 03:12:28 1.42 @@ -23,7 +23,7 @@ * 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@flab.fujitsu.co.jp of the detailed specification + * 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. * @@ -44,25 +44,26 @@ * 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.14 2000/07/13 05:09:02 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.41 2003/02/14 22:29:15 ohara Exp $ */ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if PARI +#if defined(PARI) #include "genpari.h" #endif void ox_usr1_handler(); int asir_ox_init(); +/* environement is defined in libpari.a */ extern jmp_buf environnement; extern int do_message; extern int ox_flushing; -extern jmp_buf ox_env; +extern JMP_BUF ox_env; extern MATHCAP my_mathcap; extern int little_endian,ox_sock_id; @@ -70,28 +71,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 **,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. */ @@ -126,40 +131,19 @@ 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; Obj obj; - USINT ui; ERR err; - LIST list; - NODE n,n1; unsigned int serial; int ret; extern char LastError[]; - ox_asir_init(argc,argv); + ox_asir_init(argc,argv,"ox_asir"); if ( do_message ) fprintf(stderr,"I'm an ox_asir, Version %d.\n",ASIR_VERSION); - if ( setjmp(ox_env) ) { + if ( SETJMP(ox_env) ) { while ( NEXT(asir_infile) ) closecurrentinput(); ox_send_sync(0); @@ -188,7 +172,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); @@ -271,13 +255,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: @@ -298,7 +285,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: @@ -348,13 +335,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; @@ -371,7 +360,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -387,7 +376,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; @@ -402,8 +391,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; @@ -411,7 +417,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); @@ -425,7 +431,7 @@ static void asir_popString() ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -433,7 +439,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; @@ -455,7 +461,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; @@ -476,13 +482,14 @@ static void asir_evalName(unsigned int serial) asir_push_one(val); } -static int asir_executeString() +int asir_executeString() { SNODE snode; pointer val; char *cmd; -#if PARI +#if defined(PARI) recover(0); + /* environement is defined in libpari.a */ if ( setjmp(environnement) ) { avma = top; recover(1); resetenv(""); @@ -514,11 +521,9 @@ 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]; @@ -581,7 +586,7 @@ error: asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -593,7 +598,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++; @@ -607,7 +612,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"); @@ -619,41 +624,53 @@ 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,char *servername) { - 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; + extern char displayname[]; 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 */ #endif asir_save_handler(); -#if PARI +#if defined(PARI) risa_pari_init(); #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); +#if defined(__CYGWIN__) + if ( !displayname[0] ) + do_server_in_X11 = 0; /* XXX */ +#endif output_init(); arf_init(); nglob_init(); @@ -674,9 +691,6 @@ static void ox_asir_init(int argc,char **argv) if ( ptr = getenv("ASIR_CONFIG") ) strcpy(ifname,ptr); else { -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else homedir = getenv("HOME"); if ( !homedir ) { char rootname[BUFSIZ]; @@ -685,11 +699,10 @@ static void ox_asir_init(int argc,char **argv) homedir = rootname; } sprintf(ifname,"%s/.asirrc",homedir); -#endif } 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; @@ -697,15 +710,35 @@ 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"); + create_my_mathcap(servername); } -static void ox_io_init() { +void ox_io_init() { unsigned char c,rc; + extern int I_am_server; + /* XXX : ssh forwards stdin to a remote host on PC Unix */ +#if defined(linux) +#include + int i; + + close(0); + for ( i = 5; i < NOFILE; i++ ) + close(i); +#elif defined(__FreeBSD__) +#include + int i; + struct rlimit rl; + + getrlimit(RLIMIT_NOFILE,&rl); + close(0); + for ( i = 5; i < rl.rlim_cur; i++ ) + close(i); +#endif + + I_am_server = 1; endian_init(); #if defined(VISUAL) if ( !ox_sock_id ) @@ -716,8 +749,10 @@ static void ox_io_init() { iofp[0].in = fdopen(3,"r"); iofp[0].out = fdopen(4,"w"); +#if !defined(__CYGWIN__) setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ); setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ); +#endif signal(SIGUSR1,ox_usr1_handler); #endif asir_OperandStackSize = BUFSIZ; @@ -735,6 +770,7 @@ static void ox_io_init() { register_server(0,0,0); } +#if !defined(VISUAL) /* * Library mode functions */ @@ -755,7 +791,7 @@ void asir_ox_push_cmo(void *cmo) /* * Pop an object from the stack and converts it - * int a binary encoded CMO. + * into a binary encoded CMO. */ int asir_ox_pop_cmo(void *cmo, int limit) @@ -779,6 +815,30 @@ int asir_ox_pop_cmo(void *cmo, int limit) 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. */ @@ -789,7 +849,7 @@ void asir_ox_push_cmd(int cmd) ERR err; extern char LastError[]; - if ( ret = setjmp(env) ) { + if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { create_error(&err,0,LastError); /* XXX */ @@ -816,7 +876,7 @@ void asir_ox_execute_string(char *s) MKSTR(str,s); asir_push_one((Obj)str); - if ( ret = setjmp(env) ) { + if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { create_error(&err,0,LastError); /* XXX */ @@ -840,8 +900,7 @@ int asir_ox_peek_cmo_size() Obj obj; int len; - obj = asir_pop_one(); - asir_push_one(obj); + obj = asir_peek_one(); if ( !valid_as_cmo(obj) ) { fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); return 0; @@ -850,6 +909,20 @@ int asir_ox_peek_cmo_size() return len; } +int asir_ox_peek_cmo_string_length() +{ + Obj obj; + int len; + + obj = asir_peek_one(); + if ( !valid_as_cmo(obj) ) { + fprintf(stderr,"The object at the stack top is invalid as a CMO.\n"); + return 0; + } + len = estimate_length(CO,obj); + return len+1; +} + /* * Initialization. * byteorder=0 => native @@ -872,21 +945,14 @@ int asir_ox_init(int byteorder) do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); -#if PARI +#if defined(PARI) risa_pari_init(); #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(); @@ -905,14 +971,10 @@ int asir_ox_init(int byteorder) #if defined(UINIT) reg_sysf(); #endif -#if defined(THINK_C) - sprintf(ifname,"asirrc"); -#else sprintf(ifname,"%s/.asirrc",getenv("HOME")); -#endif 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; @@ -933,3 +995,4 @@ int asir_ox_init(int byteorder) asir_reset_handler(); return 0; } +#endif