=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.52 retrieving revision 1.74 diff -u -p -r1.52 -r1.74 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2004/02/26 06:37:09 1.52 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2015/08/06 10:01:52 1.74 @@ -44,24 +44,24 @@ * 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.51 2004/02/13 05:48:36 saito Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.73 2015/08/04 06:20:45 noro Exp $ */ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if defined(PARI) -#include "genpari.h" -#endif +char *find_asirrc(); void ox_usr1_handler(); int asir_ox_init(); /* environement is defined in libpari.a */ +#if 0 # if !( PARI_VERSION_CODE > 131588) extern jmp_buf environnement; # endif +#endif extern int myrank_102,nserver_102; extern int do_message; @@ -70,11 +70,13 @@ extern JMP_BUF ox_env; extern MATHCAP my_mathcap; extern int little_endian,ox_sock_id; +extern char LastError[]; +extern LIST LastStackTrace; int ox_sock_id; int lib_ox_need_conv; -void create_error(ERR *,unsigned int ,char *); +void create_error(ERR *,unsigned int ,char *,LIST trace); int asir_OperandStackSize; Obj *asir_OperandStack; @@ -106,6 +108,7 @@ char *name_of_id(int); static void asir_do_cmd(int,unsigned int); static void asir_executeFunction(int); +static void asir_executeFunctionSync(int); #if defined(MPI) /* XXX : currently MPI version supports only a homogeneous cluster. */ @@ -119,7 +122,7 @@ void ox_mpi_master_init() { /* ordering information is not exchanged */ /* idx should be equal to i */ idx = get_iofp(i,0,0); - register_server(0,idx,idx); + register_server(0,idx,idx,-1); } } @@ -132,7 +135,7 @@ void ox_mpi_slave_init() { /* ordering information is not exchanged */ /* idx should be equal to i */ idx = get_iofp(i,0,0); - register_server(0,idx,idx); + register_server(0,idx,idx,-1); } asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); @@ -147,7 +150,6 @@ void ox_main(int argc,char **argv) { ERR err; unsigned int serial; int ret; - extern char LastError[]; ox_asir_init(argc,argv,"ox_asir"); if ( do_message ) @@ -155,13 +157,16 @@ void ox_main(int argc,char **argv) { if ( SETJMP(ox_env) ) { while ( NEXT(asir_infile) ) closecurrentinput(); + resetpvs(); + reset_engine(); + reset_io(); ox_send_sync(0); } while ( 1 ) { extern int recv_intr; serial = ox_recv(0,&id,&obj); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( recv_intr ) { if ( recv_intr == 1 ) { recv_intr = 0; @@ -183,8 +188,11 @@ void ox_main(int argc,char **argv) { fprintf(stderr," %s\n",name_of_cmd(cmd)); if ( ret = SETJMP(main_env) ) { if ( ret == 1 ) { - create_error(&err,serial,LastError); + create_error(&err,serial,LastError,LastStackTrace); asir_push_one((Obj)err); + while ( NEXT(asir_infile) ) + closecurrentinput(); + resetpvs(); } break; } @@ -251,6 +259,9 @@ static void asir_do_cmd(int cmd,unsigned int serial) case SM_executeFunction: asir_executeFunction(serial); break; + case SM_executeFunctionSync: + asir_executeFunctionSync(serial); + break; case SM_shutdown: asir_terminate(2); break; @@ -381,6 +392,9 @@ char *name_of_cmd(int cmd) case SM_reduce_102: return "SM_reduce_102"; break; + case SM_executeFunctionSync: + return "SM_executeFunctionSync"; + break; default: return "Unknown cmd"; break; @@ -429,7 +443,7 @@ void asir_popCMO(unsigned int serial) if ( valid_as_cmo(obj) ) ox_send_data(0,obj); else { - create_error(&err,serial,"cannot convert to CMO object"); + create_error(&err,serial,"cannot convert to CMO object",0); ox_send_data(0,err); asir_push_one(obj); } @@ -455,7 +469,7 @@ void asir_reduce_102(unsigned int serial) else if ( !strcmp(opname,"*") ) func = arf_mul; if ( !func ) { - create_error(&err,serial,"Invalid opration in ox_reduce_102"); + create_error(&err,serial,"Invalid opration in ox_reduce_102",0); asir_push_one(obj); } else ox_reduce_102(root,func); @@ -508,7 +522,7 @@ void asir_set_rank_102(unsigned int serial) } if ( !stat ) return; else { - create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102"); + create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102",0); asir_push_one(obj); } } @@ -536,7 +550,7 @@ void asir_tcp_accept_102(unsigned int serial) rank = QTOS((Q)r); if ( register_102(s,rank,1) < 0 ) { create_error(&err,serial, - "failed to bind or accept in ox_tcp_accept_102"); + "failed to bind or accept in ox_tcp_accept_102",0); asir_push_one((Obj)err); } } @@ -568,7 +582,7 @@ void asir_tcp_connect_102(unsigned int serial) rank = QTOS((Q)r); if ( register_102(s,rank,1) < 0 ) { create_error(&err,serial, - "failed to connect in ox_tcp_connect_102"); + "failed to connect in ox_tcp_connect_102",0); asir_push_one((Obj)err); } } @@ -585,31 +599,37 @@ void asir_pushCMOtag(unsigned int serial) MKUSINT(ui,tag); asir_push_one((Obj)ui); } else { - create_error(&err,serial,"cannot convert to CMO object"); + create_error(&err,serial,"cannot convert to CMO object",0); asir_push_one((Obj)err); } } +void print_to_wfep(Obj obj) +{ + asir_push_one(obj); + asir_popString(); +} + +extern int wfep_mode; + void asir_popString() { Obj val; - char *buf,*obuf; + char *buf; int l; STRING str; val = asir_pop_one(); if ( !val ) - obuf = "0"; - else { + buf = "0"; + else if ( wfep_mode && OID(val) == O_ERR ) { + /* XXX : for wfep */ + ox_send_data(0,val); return; + } else { l = estimate_length(CO,val); buf = (char *)ALLOCA(l+1); soutput_init(buf); sprintexpr(CO,val); -#if 0 - l = strlen(buf); - obuf = (char *)MALLOC(l+1); - strcpy(obuf,buf); -#endif } MKSTR(str,buf); ox_send_data(0,str); @@ -626,7 +646,7 @@ void asir_pops() void asir_setName(unsigned int serial) { char *name; - int l,n; + size_t l,n; char *dummy = "=0;"; SNODE snode; ERR err; @@ -637,7 +657,7 @@ void asir_setName(unsigned int serial) parse_strp = (char *)ALLOCA(n); sprintf(parse_strp,"%s%s",name,dummy); if ( mainparse(&snode) ) { - create_error(&err,serial,"cannot set to variable"); + create_error(&err,serial,"cannot set to variable",0); asir_push_one((Obj)err); } else { FA1((FNODE)FA0(snode)) = (pointer)mkfnode(1,I_FORMULA,asir_pop_one()); @@ -648,7 +668,7 @@ void asir_setName(unsigned int serial) void asir_evalName(unsigned int serial) { char *name; - int l,n; + size_t l,n; SNODE snode; ERR err; pointer val; @@ -659,18 +679,33 @@ void asir_evalName(unsigned int serial) parse_strp = (char *)ALLOCA(n); sprintf(parse_strp,"%s;",name); if ( mainparse(&snode) ) { - create_error(&err,serial,"no such variable"); + create_error(&err,serial,"no such variable",0); val = (pointer)err; } else val = evalstat(snode); asir_push_one(val); } +char *augment_backslash(char *s) +{ + char *p,*r; + int i; + + for ( i = 0, p = s; *p; p++, i++ ) if ( *p == '\\' ) i++; + r = (char *)MALLOC_ATOMIC((i+1)*sizeof(char)); + for ( i = 0, p = s; *p; p++, i++ ) { + if ( *p == '\\' ) r[i++] = '\\'; + r[i] = *p; + } + return r; +} + int asir_executeString() { SNODE snode; pointer val; char *cmd; +#if 0 #if defined(PARI) recover(0); /* environement is defined in libpari.a */ @@ -681,8 +716,15 @@ int asir_executeString() } # endif #endif +#endif cmd = ((STRING)asir_pop_one())->body; +/* XXX : probably this is useless */ +#if 0 + parse_strp = augment_backslash(cmd); +#else parse_strp = cmd; +#endif + asir_infile->ln = 1; if ( mainparse(&snode) ) { return -1; } @@ -735,6 +777,7 @@ static void asir_executeFunction(int serial) if ( n ) NEXT(n1) = 0; +#if 0 if ( !strcmp(func,"load") ) { fname = (STRING)BDY(n); if ( OID(fname) == O_STR ) { @@ -749,29 +792,103 @@ static void asir_executeFunction(int serial) } result = 0; } else { +#endif searchf(noargsysf,func,&f); if ( !f ) - searchf(sysf,func,&f); - if ( !f ) - searchf(ubinf,func,&f); - if ( !f ) - searchf(usrf,func,&f); + gen_searchf_searchonly(func,&f); if ( !f ) { sprintf(buf,"executeFunction : the function %s not found",func); goto error; } else { result = (Obj)bevalf(f,n); } +#if 0 } +#endif + printf("executeFunction done\n"); asir_push_one(result); return; error: - create_error(&err,serial,buf); + create_error(&err,serial,buf,0); result = (Obj)err; asir_push_one(result); } +static void asir_executeFunctionSync(int serial) +{ + char *func; + int argc,i; + FUNC f; + Obj result=0; + NODE n,n1; + STRING fname; + char *path; + ERR err; + Obj arg; + static char buf[BUFSIZ]; + + 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(); + } + if ( n ) + NEXT(n1) = 0; + + ox_send_data(0,ONE); + +#if 0 + if ( !strcmp(func,"load") ) { + fname = (STRING)BDY(n); + if ( OID(fname) == O_STR ) { + searchasirpath(BDY(fname),&path); + if ( path ) { + if ( do_message ) + fprintf(stderr,"loading %s\n",path); + execasirfile(path); + } else + if ( do_message ) + fprintf(stderr,"load : %s not found in the search path\n",BDY(fname)); + } + result = 0; + } else { +#endif + searchf(noargsysf,func,&f); + if ( !f ) + gen_searchf_searchonly(func,&f); + if ( !f ) { + sprintf(buf,"executeFunction : the function %s not found",func); + goto error; + } else { + result = (Obj)bevalf(f,n); + } +#if 0 + } +#endif + printf("executeFunctionSync done\n"); + ox_send_data(0,result); + return; + +error: + create_error(&err,serial,buf,0); + result = (Obj)err; + ox_send_data(0,result); +} + void asir_end_flush() { ox_flushing = 0; @@ -824,34 +941,32 @@ Obj asir_peek_one() { void ox_asir_init(int argc,char **argv,char *servername) { - char ifname[BUFSIZ]; + char *ifname; 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 do_server_sav; +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) int tmp; #endif -#if !defined(VISUAL) && !defined(MPI) + GC_init(); +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 1; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); env_init(); endian_init(); - GC_init(); cppname_init(); process_args(--argc,++argv); #if defined(__CYGWIN__) @@ -868,35 +983,24 @@ void ox_asir_init(int argc,char **argv,char *servernam pf_init(); sysf_init(); parif_init(); -#if defined(VISUAL) + order_init(); +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) init_socket(); #endif #if defined(UINIT) reg_sysf(); #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]; + /* the bottom of the input stack */ + input_init(0,"string"); - get_rootdir(rootname,sizeof(rootname)); - homedir = rootname; - } - sprintf(ifname,"%s/.asirrc",homedir); + if ( do_asirrc && (ifname = find_asirrc()) ) { + do_server_sav = do_server_in_X11; + do_server_in_X11 = 0; + if ( !SETJMP(main_env) ) + execasirfile(ifname); + do_server_in_X11 = do_server_sav; } - 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"); + /* XXX Windows compatibility */ ox_io_init(); create_my_mathcap(servername); @@ -927,7 +1031,7 @@ void ox_io_init() { I_am_server = 1; endian_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) if ( !ox_sock_id ) exit(0); iofp[0].in = WSIO_open(ox_sock_id,"r"); @@ -954,10 +1058,10 @@ void ox_io_init() { read_char(iofp[0].in,&rc); iofp[0].conv = c == rc ? 0 : 1; /* XXX; for raw I/O */ - register_server(0,0,0); + register_server(0,0,0,-1); } -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) /* * Library mode functions */ @@ -990,7 +1094,7 @@ int asir_ox_pop_cmo(void *cmo, int limit) 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."); + create_error(&err,0,"The object at the stack top is invalid as a CMO.",0); obj = (Obj)err; } len = count_as_cmo(obj); @@ -1039,7 +1143,7 @@ void asir_ox_push_cmd(int cmd) if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { - create_error(&err,0,LastError); /* XXX */ + create_error(&err,0,LastError,LastStackTrace); /* XXX */ asir_push_one((Obj)err); } } else { @@ -1066,7 +1170,7 @@ void asir_ox_execute_string(char *s) if ( ret = SETJMP(main_env) ) { asir_reset_handler(); if ( ret == 1 ) { - create_error(&err,0,LastError); /* XXX */ + create_error(&err,0,LastError,LastStackTrace); /* XXX */ asir_push_one((Obj)err); } } else { @@ -1119,28 +1223,27 @@ int asir_ox_peek_cmo_string_length() int asir_ox_init(int byteorder) { int tmp; - char ifname[BUFSIZ]; + char *ifname; 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) && !defined(MPI) + GC_init(); +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(MPI) do_server_in_X11 = 0; /* XXX */ #endif asir_save_handler(); +#if 0 #if defined(PARI) risa_pari_init(); #endif +#endif srandom((int)get_current_time()); rtime_init(); env_init(); endian_init(); - GC_init(); /* process_args(argc,argv); */ output_init(); arf_init(); @@ -1152,23 +1255,17 @@ int asir_ox_init(int byteorder) pf_init(); sysf_init(); parif_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) 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"); + if ( do_asirrc && (ifname = find_asirrc()) ) { + if ( !SETJMP(main_env) ) + execasirfile(ifname); + } asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));