===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v
retrieving revision 1.17
retrieving revision 1.25
diff -u -p -r1.17 -r1.25
--- OpenXM_contrib2/asir2000/include/ox.h	2003/01/28 08:38:58	1.17
+++ OpenXM_contrib2/asir2000/include/ox.h	2015/08/04 06:20:45	1.25
@@ -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.16 2001/12/27 07:51:16 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ox.h,v 1.24 2010/12/12 07:38:00 ohara Exp $ 
 */
 #include "com.h"
 
@@ -136,8 +136,18 @@
 #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
 
+/* local SM command in ox_asir */
+#define SM_executeFunctionSync 400
+
 #define SM_control_kill 				1024
 #define SM_control_intr 				1025
 #define SM_control_reset_connection		1030
@@ -147,7 +157,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(__DARWIN__) || (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,6 +179,7 @@ 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;
 
@@ -190,6 +201,7 @@ void read_cmo_dp(FILE *s,DP *rp);
 void read_cmo_list(FILE *s,Obj *rp);
 void read_cmo_zz(FILE *s,int *sgn,N *rp);
 void read_cmo_uint(FILE *s,USINT *rp);
+void read_cmo_bf(FILE *s,BF *q);
 void read_cmo(FILE *s,Obj *rp);
 void write_cmo_tree(FILE *s,LIST l);
 void write_cmo_error(FILE *s,ERR e);
@@ -204,30 +216,44 @@ void write_cmo_p(FILE *s,P p);
 void write_cmo_zz(FILE *s,int sgn,N n);
 void write_cmo_real(FILE *s,Real real);
 void write_cmo_q(FILE *s,Q q);
+void write_cmo_bf(FILE *s,BF q);
 void write_cmo_uint(FILE *s,USINT ui);
 void write_cmo_mathcap(FILE *s,MATHCAP mc);
 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();
@@ -252,6 +278,7 @@ int gen_fwrite (char *ptr,int size,int nitems,FILE *st
 void write_char(FILE *f,unsigned char *p);
 void write_short(FILE *f,unsigned short *p);
 void write_int(FILE *f,unsigned int *p);
+void write_int64(FILE *f,UL *p);
 void init_deskey();
 void write_intarray(FILE *f,unsigned int *p,int l);
 void write_longarray(FILE *f,unsigned long *p,int l);
@@ -260,6 +287,7 @@ void write_string(FILE *f,unsigned char *p,int l);
 void read_char(FILE *f,unsigned char *p);
 void read_short(FILE *f,unsigned short *p);
 void read_int(FILE *f,unsigned int *p);
+void read_int64(FILE *f,UL *p);
 void read_intarray(FILE *f,unsigned int *p,int l);
 void read_longarray(FILE *f,unsigned long *p,int l);
 void read_string(FILE *f,unsigned char *p,int l);
@@ -282,7 +310,7 @@ void spawn_server(char *host,char *launcher,char *serv
 	int use_unix,int use_ssh,int use_x,int conn_to_serv,
 	char *control_port_str,char *server_port_str);
 void ox_launch_main(int with_x,NODE arg,Obj *p);
-int register_server(int af_unix,int m,int c);
+int register_server(int af_unix,int m,int c,int fd);
 int get_mcindex(int i);
 void shutdown_all();