=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.18 retrieving revision 1.48 diff -u -p -r1.18 -r1.48 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2000/09/07 23:59:55 1.18 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2003/12/12 04:59:59 1.48 @@ -44,25 +44,27 @@ * 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.17 2000/08/29 04:03:06 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.47 2003/12/11 05:48:04 noro 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 myrank_102,nserver_102; 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,32 +72,40 @@ 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 Obj asir_peek_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 void asir_pushCMOtag(unsigned int); -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); +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); -#if MPI +#if defined(MPI) /* XXX : currently MPI version supports only a homogeneous cluster. */ extern int mpi_nprocs,mpi_myid; @@ -128,40 +138,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); @@ -190,7 +179,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); @@ -276,13 +265,31 @@ static void asir_do_cmd(int cmd,unsigned int serial) case SM_pushCMOtag: asir_pushCMOtag(serial); break; + case SM_set_rank_102: + asir_set_rank_102(serial); + break; + case SM_tcp_accept_102: + asir_tcp_accept_102(serial); + break; + case SM_tcp_connect_102: + asir_tcp_connect_102(serial); + break; + 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; } } -static char *name_of_id(int id) +char *name_of_id(int id) { switch ( id ) { case OX_COMMAND: @@ -303,7 +310,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: @@ -355,13 +362,30 @@ static char *name_of_cmd(int cmd) return "SM_nop"; case SM_pushCMOtag: return "SM_pushCMOtag"; + case SM_set_rank_102: + return "SM_set_rank_102"; + break; + case SM_tcp_accept_102: + return "SM_tcp_accept_102"; + break; + case SM_tcp_connect_102: + return "SM_tcp_connect_102"; + 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; default: return "Unknown cmd"; break; } } -static LIST asir_GetErrorList() +LIST asir_GetErrorList() { int i; NODE n,n0; @@ -378,7 +402,7 @@ static LIST asir_GetErrorList() return err; } -static void asir_popSerializedLocalObject() +void asir_popSerializedLocalObject() { Obj obj; VL t,vl; @@ -394,7 +418,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; @@ -409,10 +433,147 @@ static void asir_popCMO(unsigned int serial) } } -static void asir_pushCMOtag(unsigned int serial) +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"); + 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; Obj obj; + + for ( i = 0; i < myrank_102; i++ ) + do { + ox_recv_102(i,&id,&obj); + } while ( id != OX_SYNC_BALL ); + for ( i = myrank_102; i < nserver_102; i++ ) + ox_send_sync_102(i); +} + +void asir_set_rank_102(unsigned int serial) +{ + Obj obj; + Q rank,nserver; + int n,r,stat; + NODE arg; ERR err; + + rank = (Q)asir_pop_one(); + nserver = (Q)asir_pop_one(); + stat = 0; + if ( !nserver || !INT(nserver) || !INT(rank) ) { + stat = -1; + } else { + n = QTOS(nserver); r = QTOS(rank); + if ( n <= 0 || r < 0 || r >= n ) { + stat = -1; + } + myrank_102 = r; + nserver_102 = n; + } + if ( !stat ) return; + else { + create_error(&err,serial,"Invalid argument(s) in ox_set_rank_102"); + asir_push_one(obj); + } +} + +void asir_tcp_accept_102(unsigned int serial) +{ + Obj obj; + Q r,p; + ERR err; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; + + 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"); + asir_push_one((Obj)err); + } +} + +void asir_tcp_connect_102(unsigned int serial) +{ + Obj obj; + Q r,p; + STRING h; + ERR err; + char *host; + char port_str[BUFSIZ]; + int port,s,use_unix,rank; + + 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; + } else { + strcpy(port_str,BDY((STRING)p)); + use_unix = 1; + } + host = BDY((STRING)h); + 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"); + asir_push_one((Obj)err); + } +} + +void asir_pushCMOtag(unsigned int serial) +{ + Obj obj; + ERR err; USINT ui; int tag; @@ -426,7 +587,7 @@ static void asir_pushCMOtag(unsigned int serial) } } -static void asir_popString() +void asir_popString() { Obj val; char *buf,*obuf; @@ -435,7 +596,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); @@ -449,7 +610,7 @@ static void asir_popString() ox_send_data(0,str); } -static void asir_pops() +void asir_pops() { int n; @@ -457,7 +618,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; @@ -479,7 +640,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; @@ -500,13 +661,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(""); @@ -538,11 +700,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]; @@ -605,7 +765,7 @@ error: asir_push_one(result); } -static void asir_end_flush() +void asir_end_flush() { ox_flushing = 0; } @@ -617,7 +777,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++; @@ -631,7 +791,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"); @@ -643,7 +803,7 @@ static Obj asir_pop_one() { } } -static Obj asir_peek_one() { +Obj asir_peek_one() { if ( asir_OperandStackPtr < 0 ) { if ( do_message ) fprintf(stderr,"OperandStack underflow"); @@ -655,41 +815,42 @@ static Obj asir_peek_one() { } } -static void ox_asir_init(int argc,char **argv) +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 +#if !defined(VISUAL) && !defined(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(); + cppname_init(); process_args(--argc,++argv); +#if defined(__CYGWIN__) + if ( !displayname[0] ) + do_server_in_X11 = 0; /* XXX */ +#endif output_init(); arf_init(); nglob_init(); @@ -710,9 +871,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]; @@ -721,11 +879,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; @@ -733,15 +890,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 ) @@ -752,8 +929,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; @@ -792,7 +971,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) @@ -816,6 +995,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. */ @@ -826,7 +1029,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 */ @@ -853,7 +1056,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 */ @@ -877,8 +1080,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; @@ -887,6 +1089,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 @@ -905,25 +1121,18 @@ int asir_ox_init(int byteorder) static ox_asir_initialized = 0; FILE *ifp; -#if !defined(VISUAL) && !MPI +#if !defined(VISUAL) && !defined(MPI) 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(); @@ -942,14 +1151,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;