=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.45 retrieving revision 1.70 diff -u -p -r1.45 -r1.70 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2003/12/09 03:07:45 1.45 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2011/01/13 08:00:07 1.70 @@ -44,7 +44,7 @@ * 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.44 2003/04/23 07:03:53 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.69 2011/01/12 03:05:06 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -59,7 +59,9 @@ void ox_usr1_handler(); int asir_ox_init(); /* environement is defined in libpari.a */ +# if !( PARI_VERSION_CODE > 131588) extern jmp_buf environnement; +# endif extern int myrank_102,nserver_102; extern int do_message; @@ -68,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; @@ -96,12 +100,15 @@ void asir_set_rank_102(unsigned int); void asir_tcp_accept_102(unsigned int); void asir_tcp_connect_102(unsigned int); void asir_reset_102(unsigned int serial); +void asir_bcast_102(unsigned int serial); +void asir_reduce_102(unsigned int serial); 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 void asir_executeFunctionSync(int); #if defined(MPI) /* XXX : currently MPI version supports only a homogeneous cluster. */ @@ -115,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); } } @@ -128,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)); @@ -143,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 ) @@ -151,6 +157,9 @@ 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 ) { @@ -179,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; } @@ -247,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; @@ -275,6 +290,12 @@ static void asir_do_cmd(int cmd,unsigned int serial) case SM_reset_102: asir_reset_102(serial); break; + case SM_bcast_102: + asir_bcast_102(serial); + break; + case SM_reduce_102: + asir_reduce_102(serial); + break; case SM_nop: default: break; @@ -365,6 +386,15 @@ char *name_of_cmd(int cmd) case SM_reset_102: return "SM_reset_102"; break; + case SM_bcast_102: + return "SM_bcast_102"; + break; + case SM_reduce_102: + return "SM_reduce_102"; + break; + case SM_executeFunctionSync: + return "SM_executeFunctionSync"; + break; default: return "Unknown cmd"; break; @@ -413,12 +443,49 @@ 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); } } +void asir_reduce_102(unsigned int serial) +{ + Q r; + int root; + Obj data,obj; + ERR err; + STRING op; + char *opname; + void (*func)(); + + func = 0; + op = (STRING)asir_pop_one(); + opname = BDY(op); + r = (Q)asir_pop_one(); + root = QTOS(r); + if ( !strcmp(opname,"+") ) + func = arf_add; + else if ( !strcmp(opname,"*") ) + func = arf_mul; + if ( !func ) { + create_error(&err,serial,"Invalid opration in ox_reduce_102",0); + asir_push_one(obj); + } else + ox_reduce_102(root,func); +} + +void asir_bcast_102(unsigned int serial) +{ + Q r; + int root; + Obj data; + + r = (Q)asir_pop_one(); + root = QTOS(r); + ox_bcast_102(root); +} + void asir_reset_102(unsigned int serial) { int i,j,id; @@ -428,12 +495,10 @@ void asir_reset_102(unsigned int serial) do { ox_recv_102(i,&id,&obj); } while ( id != OX_SYNC_BALL ); - for ( i = myrank_102; i < nserver_102; i++ ) + for ( i = myrank_102+1; i < nserver_102; i++ ) ox_send_sync_102(i); } -extern int myrank_102,nserver_102; - void asir_set_rank_102(unsigned int serial) { Obj obj; @@ -457,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); } } @@ -465,17 +530,27 @@ void asir_set_rank_102(unsigned int serial) void asir_tcp_accept_102(unsigned int serial) { Obj obj; - Q rank,port,ret; - NODE arg; + Q r,p; ERR err; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; - rank = (Q)asir_pop_one(); - port = (Q)asir_pop_one(); - arg = mknode(2,port,rank); - Pox_tcp_accept_102(arg,&ret); - if ( !ret ) return; - else { - create_error(&err,serial,"failed to bind or accept in ox_tcp_accept_102"); + r = (Q)asir_pop_one(); + p = (Q)asir_pop_one(); + if ( IS_CYGWIN || !p || NUM(p) ) { + port = QTOS(p); + sprintf(port_str,"%d",port); + use_unix = 0; + } else { + strcpy(port_str,BDY((STRING)p)); + use_unix = 1; + } + s = try_bind_listen(use_unix,port_str); + s = try_accept(use_unix,s); + 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",0); asir_push_one((Obj)err); } } @@ -483,19 +558,31 @@ void asir_tcp_accept_102(unsigned int serial) void asir_tcp_connect_102(unsigned int serial) { Obj obj; - Q rank,port,ret; - STRING host; - NODE arg; + Q r,p; + STRING h; ERR err; + char *host; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; - rank = (Q)asir_pop_one(); - port = (Q)asir_pop_one(); - host = (STRING)asir_pop_one(); - arg = mknode(3,host,port,rank); - Pox_tcp_connect_102(arg,&ret); - if ( !ret ) return; - else { - create_error(&err,serial,"failed to connect in ox_tcp_connect_102"); + r = (Q)asir_pop_one(); + p = (Q)asir_pop_one(); + h = (STRING)asir_pop_one(); + if ( IS_CYGWIN || !p || NUM(p) ) { + port = QTOS(p); + sprintf(port_str,"%d",port); + use_unix = 0; + host = BDY((STRING)h); + } else { + strcpy(port_str,BDY((STRING)p)); + use_unix = 1; + host = 0; + } + s = try_connect(use_unix,host,port_str); + rank = QTOS((Q)r); + if ( register_102(s,rank,1) < 0 ) { + create_error(&err,serial, + "failed to connect in ox_tcp_connect_102",0); asir_push_one((Obj)err); } } @@ -512,31 +599,39 @@ 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); - l = strlen(buf); - obuf = (char *)MALLOC(l+1); - strcpy(obuf,buf); } - MKSTR(str,obuf); + MKSTR(str,buf); ox_send_data(0,str); } @@ -562,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()); @@ -584,13 +679,27 @@ 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; @@ -599,13 +708,21 @@ int asir_executeString() #if defined(PARI) recover(0); /* environement is defined in libpari.a */ +# if !(PARI_VERSION_CODE > 131588 ) if ( setjmp(environnement) ) { avma = top; recover(1); resetenv(""); } +# 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; } @@ -658,6 +775,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 ) { @@ -672,29 +790,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; @@ -749,7 +941,6 @@ void ox_asir_init(int argc,char **argv,char *servernam { 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[]; @@ -758,10 +949,12 @@ void ox_asir_init(int argc,char **argv,char *servernam FILE *ifp; char *homedir; char *ptr; + int do_server_sav; #if !defined(VISUAL) int tmp; #endif + GC_init(); #if !defined(VISUAL) && !defined(MPI) do_server_in_X11 = 1; /* XXX */ #endif @@ -774,7 +967,6 @@ void ox_asir_init(int argc,char **argv,char *servernam rtime_init(); env_init(); endian_init(); - GC_init(); cppname_init(); process_args(--argc,++argv); #if defined(__CYGWIN__) @@ -791,6 +983,7 @@ void ox_asir_init(int argc,char **argv,char *servernam pf_init(); sysf_init(); parif_init(); + order_init(); #if defined(VISUAL) init_socket(); #endif @@ -810,16 +1003,19 @@ void ox_asir_init(int argc,char **argv,char *servernam } sprintf(ifname,"%s/.asirrc",homedir); } + + /* the bottom of the input stack */ + input_init(0,"string"); + 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); + 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; } - input_init(0,"string"); + /* XXX Windows compatibility */ ox_io_init(); create_my_mathcap(servername); @@ -877,7 +1073,7 @@ 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) @@ -913,7 +1109,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); @@ -962,7 +1158,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 { @@ -989,7 +1185,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 { @@ -1044,13 +1240,13 @@ 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; + GC_init(); #if !defined(VISUAL) && !defined(MPI) do_server_in_X11 = 0; /* XXX */ #endif @@ -1063,7 +1259,6 @@ int asir_ox_init(int byteorder) rtime_init(); env_init(); endian_init(); - GC_init(); /* process_args(argc,argv); */ output_init(); arf_init(); @@ -1081,17 +1276,13 @@ int asir_ox_init(int byteorder) #if defined(UINIT) reg_sysf(); #endif + input_init(0,"string"); 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); + if ( !SETJMP(main_env) ) + execasirfile(ifname); } - input_init(0,"string"); asir_OperandStackSize = BUFSIZ; asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));