=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v retrieving revision 1.39 retrieving revision 1.45 diff -u -p -r1.39 -r1.45 --- OpenXM_contrib2/asir2000/io/ox_asir.c 2002/02/25 06:47:39 1.39 +++ OpenXM_contrib2/asir2000/io/ox_asir.c 2003/12/09 03:07:45 1.45 @@ -44,14 +44,14 @@ * 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.38 2002/02/25 06:39:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.44 2003/04/23 07:03:53 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 @@ -60,6 +60,7 @@ 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; @@ -78,7 +79,7 @@ Obj *asir_OperandStack; int asir_OperandStackPtr = -1; void ox_io_init(); -void ox_asir_init(int,char **); +void ox_asir_init(int,char **,char *); Obj asir_pop_one(); Obj asir_peek_one(); void asir_push_one(Obj); @@ -91,6 +92,10 @@ 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); LIST asir_GetErrorList(); char *name_of_cmd(int); char *name_of_id(int); @@ -98,7 +103,7 @@ 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; @@ -140,7 +145,7 @@ void ox_main(int argc,char **argv) { 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) ) { @@ -258,6 +263,18 @@ 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_nop: default: break; @@ -337,6 +354,17 @@ 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; default: return "Unknown cmd"; break; @@ -391,6 +419,87 @@ void asir_popCMO(unsigned int serial) } } +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); +} + +extern int myrank_102,nserver_102; + +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 rank,port,ret; + NODE arg; + ERR err; + + 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"); + asir_push_one((Obj)err); + } +} + +void asir_tcp_connect_102(unsigned int serial) +{ + Obj obj; + Q rank,port,ret; + STRING host; + NODE arg; + ERR err; + + 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"); + asir_push_one((Obj)err); + } +} + void asir_pushCMOtag(unsigned int serial) { Obj obj; @@ -487,7 +596,7 @@ 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) ) { @@ -636,7 +745,7 @@ Obj asir_peek_one() { } } -void ox_asir_init(int argc,char **argv) +void ox_asir_init(int argc,char **argv,char *servername) { char ifname[BUFSIZ]; extern int GC_dont_gc; @@ -653,11 +762,11 @@ void ox_asir_init(int argc,char **argv) 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()); @@ -666,6 +775,7 @@ void ox_asir_init(int argc,char **argv) env_init(); endian_init(); GC_init(); + cppname_init(); process_args(--argc,++argv); #if defined(__CYGWIN__) if ( !displayname[0] ) @@ -712,7 +822,7 @@ void ox_asir_init(int argc,char **argv) input_init(0,"string"); /* XXX Windows compatibility */ ox_io_init(); - create_my_mathcap("ox_asir"); + create_my_mathcap(servername); } void ox_io_init() { @@ -941,11 +1051,11 @@ 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());