=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v retrieving revision 1.20 retrieving revision 1.38 diff -u -p -r1.20 -r1.38 --- OpenXM_contrib2/asir2000/io/ox.c 2003/03/07 03:12:28 1.20 +++ OpenXM_contrib2/asir2000/io/ox.c 2016/08/24 00:52:50 1.38 @@ -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.c,v 1.19 2003/02/14 22:29:15 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.37 2016/06/29 05:10:14 ohara Exp $ */ #include "ca.h" #include "parse.h" @@ -56,6 +56,7 @@ extern Obj VOIDobj; +extern int nserver_102, myrank_102; extern int ox_need_conv; int ox_usr1_sent, ox_int_received, critical_when_signal; unsigned int ox_serial; @@ -81,6 +82,7 @@ struct mathcap { unsigned int *smcap; int noxcap; struct oxcap *oxcap; + int no_ox_reset; }; struct oxcap *my_oxcap; @@ -90,9 +92,12 @@ static struct mathcap *remote_mc; static int remote_mc_len; void mclist_to_mc(LIST mclist,struct mathcap *mc); +Obj asir_pop_one(); +void asir_push_one(Obj); -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) /* XXX : mainly used in engine2000/io.c, but declared here */ +typedef void *HANDLE; HANDLE hStreamNotify,hStreamNotify_Ack; void cleanup_events() @@ -104,9 +109,18 @@ void cleanup_events() } #endif +/* 1 if no_ox_reset, 0 if ox_reset OK, -1 if invalid */ +int no_ox_reset(int s) +{ + if ( remote_mc && s >= 0 && s < remote_mc_len ) + return remote_mc[s].no_ox_reset; + else + return -1; +} + void ox_resetenv(char *s) { -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) cleanup_events(); #endif fprintf(stderr,"%s\n",s); @@ -119,9 +133,10 @@ static int available_cmo[] = { CMO_ZZ, CMO_QQ, CMO_ZERO, CMO_DMS_GENERIC, CMO_DMS_OF_N_VARIABLES, CMO_RING_BY_NAME, CMO_DISTRIBUTED_POLYNOMIAL, + CMO_RATIONAL, CMO_RECURSIVE_POLYNOMIAL, CMO_UNIVARIATE_POLYNOMIAL, CMO_INDETERMINATE, - CMO_TREE, + CMO_TREE, CMO_BIGFLOAT32, CMO_COMPLEX, 0 }; @@ -143,7 +158,9 @@ static int ox_asir_available_sm[] = { SM_executeStringByLocalParserInBatchMode, SM_executeFunction, SM_shutdown, SM_pops, SM_mathcap, SM_setMathcap, SM_nop, - SM_beginBlock, SM_endBlock, + SM_beginBlock, SM_endBlock, SM_executeFunctionSync, + SM_set_rank_102, SM_tcp_accept_102, SM_tcp_connect_102, SM_reset_102, + SM_bcast_102, SM_reduce_102, 0 }; @@ -293,6 +310,7 @@ void mclist_to_mc(LIST mclist,struct mathcap *mc) [o2,[n21,n22,...]], ... ] + (optional)[s1,s2,...] (no_ox_reset) ] */ n = BDY(mclist); @@ -325,6 +343,15 @@ void mclist_to_mc(LIST mclist,struct mathcap *mc) for ( t = cap, ptr = mc->oxcap[j].cap, i = 0; i < l; t = NEXT(t), i++ ) ptr[i] = BDY((USINT)BDY(t)); } + /* check of no_ox_reset */ + mc->no_ox_reset = 0; + n = BDY(mclist); + if ( length(n) >= 4 ) { + t = BDY((LIST)ARG3(n)); + for ( ; t; t = NEXT(t) ) + if ( !strcmp(BDY((STRING)BDY(t)),"no_ox_reset") ) + mc->no_ox_reset = 1; + } } int check_sm_by_mc(int s,unsigned int smtag) @@ -389,7 +416,7 @@ void end_critical() { critical_when_signal = 0; if ( ox_usr1_sent ) { ox_usr1_sent = 0; -#if !defined(VISUAL) +#if !defined(VISUAL) && !defined(__MINGW32__) ox_usr1_handler(SIGUSR1); #else ox_usr1_handler(0); @@ -400,11 +427,13 @@ void end_critical() { } } -extern FUNC registered_handler; +extern NODE user_int_handler; void ox_usr1_handler(int sig) { -#if !defined(VISUAL) + NODE t; + +#if !defined(VISUAL) && !defined(__MINGW32__) signal(SIGUSR1,ox_usr1_handler); #endif if ( critical_when_signal ) { @@ -412,10 +441,11 @@ void ox_usr1_handler(int sig) ox_usr1_sent = 1; } else { ox_flushing = 1; - if ( registered_handler ) { + if ( user_int_handler ) { fprintf(stderr, - "usr1 : calling the registered exception handler..."); - bevalf(registered_handler,0); + "usr1 : calling the registered exception handlers..."); + for ( t = user_int_handler; t; t = NEXT(t) ) + bevalf((FUNC)BDY(t),0); fprintf(stderr, "done.\n"); } ox_resetenv("usr1 : return to toplevel by SIGUSR1"); @@ -455,6 +485,11 @@ void wait_for_data(int s) { return; } + +void wait_for_data_102(int rank) +{ + return; +} #else int ox_data_is_available(int s) { @@ -467,7 +502,7 @@ void wait_for_data(int s) int sock; if ( !FP_DATA_IS_AVAILABLE(iofp[s].in) ) { -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) sock = iofp[s].in->fildes; FD_ZERO(&r); FD_SET((unsigned int)sock,&r); @@ -480,14 +515,34 @@ void wait_for_data(int s) #endif } } + +void wait_for_data_102(int rank) +{ + fd_set r; + int sock; + + if ( !FP_DATA_IS_AVAILABLE(iofp_102[rank].in) ) { +#if defined(VISUAL) || defined(__MINGW32__) + sock = iofp_102[rank].in->fildes; + FD_ZERO(&r); + FD_SET((unsigned int)sock,&r); + select(0,&r,NULL,NULL,NULL); +#else + sock = fileno(iofp_102[rank].in); + FD_ZERO(&r); + FD_SET(sock,&r); + select(FD_SETSIZE,&r,NULL,NULL,NULL); #endif + } +} +#endif void ox_send_data(int s,pointer p) { ERR err; if ( ox_check && !ox_check_cmo(s,(Obj)p) ) { - create_error(&err,ox_serial,"ox_send_data : Mathcap violation"); + create_error(&err,ox_serial,"ox_send_data : Mathcap violation",0); p = (pointer)err; } begin_critical(); @@ -498,6 +553,72 @@ void ox_send_data(int s,pointer p) end_critical(); } +void ox_send_data_102(int rank,pointer p) +{ + ERR err; + + begin_critical(); + ox_write_int_102(rank,OX_DATA); + ox_write_int_102(rank,ox_serial++); + ox_write_cmo_102(rank,p); + ox_flush_stream_102(rank); + end_critical(); +} + +void ox_bcast_102(int root) +{ + Obj data; + int r,mask,id,src,dst; + + r = myrank_102-root; + if ( r == 0 ) + data = (Obj)asir_pop_one(); + + if ( r < 0 ) r += nserver_102; + for ( mask = 1; mask < nserver_102; mask <<= 1 ) + if ( r&mask ) { + src = myrank_102-mask; + if ( src < 0 ) src += nserver_102; + ox_recv_102(src,&id,&data); + break; + } + for ( mask >>= 1; mask > 0; mask >>= 1 ) + if ( (r+mask) < nserver_102 ) { + dst = myrank_102+mask; + if ( dst >= nserver_102 ) dst -= nserver_102; + ox_send_data_102(dst,data); + } + asir_push_one(data); +} + +/* func : an arithmetic funcion func(vl,a,b,*c) */ + +void ox_reduce_102(int root,void (*func)()) +{ + Obj data,data0,t; + int r,mask,id,src,dst; + + r = myrank_102-root; + if ( r < 0 ) r += nserver_102; + data = (Obj)asir_pop_one(); + for ( mask = 1; mask < nserver_102; mask <<= 1 ) + if ( r&mask ) { + dst = (r-mask)+root; + if ( dst >= nserver_102 ) dst -= nserver_102; + ox_send_data_102(dst,data); + break; + } else { + src = r+mask; + if ( src < nserver_102 ) { + src += root; + if ( src >= nserver_102 ) src -= nserver_102; + ox_recv_102(src,&id,&data0); + (*func)(CO,data,data0,&t); data = t; + } + } + asir_push_one(r?0:data); +} + void ox_send_cmd(int s,int id) { if ( ox_check && !check_sm_by_mc(s,id) ) @@ -519,6 +640,15 @@ void ox_send_sync(int s) end_critical(); } +void ox_send_sync_102(int rank) +{ + begin_critical(); + ox_write_int_102(rank,OX_SYNC_BALL); + ox_write_int_102(rank,ox_serial++); + ox_flush_stream_102(rank); + end_critical(); +} + void ox_send_local_data(int s,Obj p) { begin_critical(); @@ -530,6 +660,17 @@ void ox_send_local_data(int s,Obj p) end_critical(); } +void ox_send_local_data_102(int rank,Obj p) +{ + begin_critical(); + ox_write_int_102(rank,OX_LOCAL_OBJECT_ASIR); + ox_write_int_102(rank,ox_serial++); + ox_write_int_102(rank,ASIR_OBJ); + saveobj((FILE *)iofp_102[rank].out,p); + ox_flush_stream_102(rank); + end_critical(); +} + void ox_send_local_ring(int s,VL vl) { begin_critical(); @@ -541,6 +682,17 @@ void ox_send_local_ring(int s,VL vl) end_critical(); } +void ox_send_local_ring_102(int rank,VL vl) +{ + begin_critical(); + ox_write_int_102(rank,OX_LOCAL_OBJECT_ASIR); + ox_write_int_102(rank,ox_serial++); + ox_write_int_102(rank,ASIR_VL); + savevl((FILE *)iofp_102[rank].out,vl); + ox_flush_stream_102(rank); + end_critical(); +} + unsigned int ox_recv(int s, int *id, Obj *p) { unsigned int cmd,serial; @@ -570,6 +722,35 @@ unsigned int ox_recv(int s, int *id, Obj *p) return serial; } +unsigned int ox_recv_102(int rank, int *id, Obj *p) +{ + unsigned int cmd,serial; + USINT ui; + + wait_for_data_102(rank); + begin_critical(); + ox_read_int_102(rank,id); + ox_read_int_102(rank,&serial); + switch ( *id ) { + case OX_COMMAND: + ox_read_int_102(rank,&cmd); + MKUSINT(ui,cmd); + *p = (Obj)ui; + break; + case OX_DATA: + ox_read_cmo_102(rank,p); + break; + case OX_LOCAL_OBJECT_ASIR: + ox_read_local_102(rank,p); + break; + default: + *p = 0; + break; + } + end_critical(); + return serial; +} + void ox_get_result(int s,Obj *rp) { int id; @@ -600,12 +781,25 @@ void ox_read_int(int s, int *n) read_int((FILE *)iofp[s].in,n); } +void ox_read_int_102(int rank, int *n) +{ + ox_need_conv = iofp_102[rank].conv; + read_int((FILE *)iofp_102[rank].in,n); +} + void ox_read_cmo(int s, Obj *rp) { ox_need_conv = iofp[s].conv; read_cmo((FILE *)iofp[s].in,rp); } +void ox_read_cmo_102(int rank, Obj *rp) +{ + ox_need_conv = iofp_102[rank].conv; + read_cmo((FILE *)iofp_102[rank].in,rp); +} + + void ox_read_local(int s, Obj *rp) { int id; @@ -626,18 +820,50 @@ void ox_read_local(int s, Obj *rp) } } +void ox_read_local_102(int rank, Obj *rp) +{ + int id; + + ox_need_conv = iofp_102[rank].conv; + read_int((FILE *)iofp_102[rank].in,&id); + switch ( id ) { + case ASIR_VL: + loadvl((FILE *)iofp_102[rank].in); + *rp = VOIDobj; + break; + case ASIR_OBJ: + loadobj((FILE *)iofp_102[rank].in,rp); + break; + default: + error("ox_read_local_102 : unsupported id"); + break; + } +} + void ox_write_int(int s, int n) { ox_need_conv = iofp[s].conv; write_int((FILE *)iofp[s].out,&n); } +void ox_write_int_102(int rank, int n) +{ + ox_need_conv = iofp_102[rank].conv; + write_int((FILE *)iofp_102[rank].out,&n); +} + void ox_write_cmo(int s, Obj obj) { ox_need_conv = iofp[s].conv; write_cmo((FILE *)iofp[s].out,obj); } +void ox_write_cmo_102(int rank, Obj obj) +{ + ox_need_conv = iofp_102[rank].conv; + write_cmo((FILE *)iofp_102[rank].out,obj); +} + int ox_check_cmo(int s, Obj obj) { NODE m; @@ -669,7 +895,7 @@ int ox_check_cmo(int s, Obj obj) return check_by_mc(s,OX_DATA,CMO_ZZ); else return check_by_mc(s,OX_DATA,CMO_QQ); - case N_R: + case N_R: case N_B: case N_C: return 1; default: return 0; @@ -682,6 +908,8 @@ int ox_check_cmo(int s, Obj obj) return 1; case O_QUOTE: /* XXX */ return 1; + case O_MAT: /* MAT is sent as a list */ + return 1; default: return 0; } @@ -730,7 +958,7 @@ void ox_flush_stream(int s) { if ( ox_batch ) return; -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) if ( _fileno(&iofp[s].out->fp) < 0 ) cflush(iofp[s].out); else @@ -744,7 +972,7 @@ void ox_flush_stream(int s) void ox_flush_stream_force(int s) { -#if defined(VISUAL) +#if defined(VISUAL) || defined(__MINGW32__) if ( _fileno(&iofp[s].out->fp) < 0 ) cflush(iofp[s].out); else @@ -754,4 +982,22 @@ void ox_flush_stream_force(int s) else #endif fflush((FILE *)iofp[s].out); +} + +void ox_flush_stream_102(int rank) +{ + if ( !ox_batch ) + ox_flush_stream_force_102(rank); +} + +void ox_flush_stream_force_102(int rank) +{ + if ( iofp_102[rank].out ) +#if defined(VISUAL) || defined(__MINGW32__) + cflush(iofp_102[rank].out); +#elif MPI + cflush(iofp_102[rank].out); +#else + fflush(iofp_102[rank].out); +#endif }