=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v retrieving revision 1.16 retrieving revision 1.21 diff -u -p -r1.16 -r1.21 --- OpenXM_contrib2/asir2000/include/ox.h 2001/12/27 07:51:16 1.16 +++ OpenXM_contrib2/asir2000/include/ox.h 2004/01/25 11:54:09 1.21 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.15 2001/12/25 02:39:04 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.20 2003/12/11 05:48:04 noro Exp $ */ #include "com.h" @@ -136,6 +136,13 @@ #define SM_dupErrors 276 #define SM_pushCMOtag 277 +#define SM_set_rank_102 278 +#define SM_tcp_accept_102 279 +#define SM_tcp_connect_102 280 +#define SM_reset_102 281 +#define SM_bcast_102 282 +#define SM_reduce_102 283 + #define SM_nop 300 #define SM_control_kill 1024 @@ -147,7 +154,7 @@ typedef FILE *ox_stream; /* a macro to check whether data are available in the read buffer */ #if defined(linux) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_IO_read_ptr < (fp)->_IO_read_end) -#elif defined(__FreeBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) +#elif defined(__FreeBSD__) || (defined(__MACH__) && defined(__ppc__)) || defined(__CYGWIN__) || defined(__INTERIX) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_r) #elif defined(sparc) || defined(__alpha) || defined(__SVR4) || defined(mips) || defined(_IBMR2) #define FP_DATA_IS_AVAILABLE(fp) ((fp)->_cnt) @@ -169,10 +176,15 @@ extern int ox_do_copy, ox_do_count, ox_count_length; extern char *ox_copy_bptr; extern struct IOFP iofp[]; +extern struct IOFP iofp_102[]; extern char *parse_strp; +#if 0 #define LBUFSIZ BUFSIZ*10 +#else +#define LBUFSIZ BUFSIZ +#endif /* prototypes */ @@ -206,24 +218,37 @@ int cmo_tag(Obj obj,int *tag); void write_cmo(FILE *s,Obj obj); int valid_as_cmo(Obj obj); void ox_flush_stream_force(int s); +void ox_flush_stream_force_102(int s); void ox_flush_stream(int s); +void ox_flush_stream_102(int s); int ox_check_cmo_dp(int s, DP p); int ox_check_cmo_p(int s, P p); void ox_get_serverinfo(int s, LIST *rp); int ox_check_cmo(int s, Obj obj); void ox_write_cmo(int s, Obj obj); +void ox_write_cmo_102(int s, Obj obj); void ox_write_int(int s, int n); +void ox_write_int_102(int s, int n); void ox_read_local(int s, Obj *rp); +void ox_read_local_102(int s, Obj *rp); void ox_read_cmo(int s, Obj *rp); +void ox_read_cmo_102(int s, Obj *rp); void ox_read_int(int s, int *n); +void ox_read_int_102(int s, int *n); void ox_get_result(int s,Obj *rp); unsigned int ox_recv(int s, int *id, Obj *p); +unsigned int ox_recv_102(int s, int *id, Obj *p); void ox_send_local_ring(int s,VL vl); +void ox_send_local_ring_102(int s,VL vl); void ox_send_local_data(int s,Obj p); +void ox_send_local_data_102(int s,Obj p); void ox_send_sync(int s); +void ox_send_sync_102(int s); void ox_send_cmd(int s,int id); void ox_send_data(int s,pointer p); +void ox_send_data_102(int s,pointer p); void wait_for_data(int s); +void wait_for_data_102(int s); int ox_data_is_available(int s); void clear_readbuffer(); void end_critical();