=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.65 retrieving revision 1.79 diff -u -p -r1.65 -r1.79 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2006/09/29 09:02:49 1.65 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2017/08/30 09:40:30 1.79 @@ -44,24 +44,23 @@ * 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.64 2006/09/26 05:35:26 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.78 2016/08/24 08:21:03 ohara Exp $ */ #include "ca.h" #include "parse.h" #include "signal.h" #include "ox.h" #include "version.h" -#if defined(PARI) -#include "genpari.h" -#endif -void ox_usr1_handler(); +char *find_asirrc(); 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; @@ -108,6 +107,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. */ @@ -121,7 +121,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); } } @@ -134,7 +134,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)); @@ -162,19 +162,9 @@ void ox_main(int argc,char **argv) { ox_send_sync(0); } while ( 1 ) { - extern int recv_intr; - serial = ox_recv(0,&id,&obj); -#if defined(VISUAL) - if ( recv_intr ) { - if ( recv_intr == 1 ) { - recv_intr = 0; - int_handler(SIGINT); - } else { - recv_intr = 0; - ox_usr1_handler(0); - } - } +#if defined(VISUAL) || defined(__MINGW32__) + check_intr(); #endif if ( do_message ) fprintf(stderr,"#%d Got %s",serial,name_of_id(id)); @@ -258,6 +248,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; @@ -388,6 +381,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; @@ -639,7 +635,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; @@ -661,7 +657,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; @@ -698,6 +694,7 @@ int asir_executeString() SNODE snode; pointer val; char *cmd; +#if 0 #if defined(PARI) recover(0); /* environement is defined in libpari.a */ @@ -708,6 +705,7 @@ int asir_executeString() } # endif #endif +#endif cmd = ((STRING)asir_pop_one())->body; /* XXX : probably this is useless */ #if 0 @@ -786,11 +784,7 @@ static void asir_executeFunction(int serial) #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; @@ -800,6 +794,7 @@ static void asir_executeFunction(int serial) #if 0 } #endif + printf("executeFunction done\n"); asir_push_one(result); return; @@ -809,6 +804,80 @@ error: 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; @@ -861,29 +930,27 @@ 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 do_asirrc; extern int do_server_in_X11; extern char displayname[]; - char *getenv(); static ox_asir_initialized = 0; - FILE *ifp; - char *homedir; - char *ptr; int do_server_sav; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) int tmp; #endif GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !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(); @@ -905,31 +972,17 @@ 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__) 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]; - - get_rootdir(rootname,sizeof(rootname)); - homedir = rootname; - } - sprintf(ifname,"%s/.asirrc",homedir); - } - /* the bottom of the input stack */ input_init(0,"string"); - if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - fclose(ifp); + if ( do_asirrc && (ifname = find_asirrc()) ) { do_server_sav = do_server_in_X11; do_server_in_X11 = 0; if ( !SETJMP(main_env) ) @@ -967,7 +1020,7 @@ void ox_io_init() { I_am_server = 1; endian_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) if ( !ox_sock_id ) exit(0); iofp[0].in = WSIO_open(ox_sock_id,"r"); @@ -980,7 +1033,7 @@ void ox_io_init() { setbuffer(iofp[0].in,(char *)malloc(LBUFSIZ),LBUFSIZ); setbuffer(iofp[0].out,(char *)malloc(LBUFSIZ),LBUFSIZ); #endif - signal(SIGUSR1,ox_usr1_handler); + set_signal(SIGUSR1,ox_usr1_handler); #endif asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj)); @@ -994,10 +1047,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__) /* * Library mode functions */ @@ -1159,22 +1212,22 @@ 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 do_asirrc; extern int do_server_in_X11; - char *getenv(); static ox_asir_initialized = 0; - FILE *ifp; GC_init(); -#if !defined(VISUAL) && !defined(MPI) +#if !defined(VISUAL) && !defined(__MINGW32__) && !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(); @@ -1191,16 +1244,14 @@ int asir_ox_init(int byteorder) pf_init(); sysf_init(); parif_init(); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) init_socket(); #endif #if defined(UINIT) reg_sysf(); #endif input_init(0,"string"); - sprintf(ifname,"%s/.asirrc",getenv("HOME")); - if ( do_asirrc && (ifp = fopen(ifname,"r")) ) { - fclose(ifp); + if ( do_asirrc && (ifname = find_asirrc()) ) { if ( !SETJMP(main_env) ) execasirfile(ifname); }