===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ox.h,v
retrieving revision 1.17
retrieving revision 1.32
diff -u -p -r1.17 -r1.32
--- OpenXM_contrib2/asir2000/include/ox.h	2003/01/28 08:38:58	1.17
+++ OpenXM_contrib2/asir2000/include/ox.h	2020/10/04 03:14:08	1.32
@@ -45,74 +45,76 @@
  * 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.31 2018/03/29 01:32:53 noro Exp $ 
 */
 #include "com.h"
 
 /* version */
 
-#define OX_VERSION		199901160
+#define OX_VERSION    199901160
 
 /* header */
 
-#define OX_COMMAND		513
-#define OX_DATA			514
-#define OX_SYNC_BALL	515
+#define OX_COMMAND    513
+#define OX_DATA      514
+#define OX_SYNC_BALL  515
 
-#define OX_DATA_WITH_SIZE		521
-#define OX_DATA_ASIR_BINARY_EXPRESSION		522
+#define OX_DATA_WITH_SIZE    521
+#define OX_DATA_ASIR_BINARY_EXPRESSION    522
 
-#define OX_LOCAL_OBJECT	0x7fcdef30
+#define OX_LOCAL_OBJECT  0x7fcdef30
 
 #define OX_LOCAL_OBJECT_ASIR (OX_LOCAL_OBJECT+0)
-#define OX_LOCAL_OBJECT_SM1	(OX_LOCAL_OBJECT+1)
+#define OX_LOCAL_OBJECT_SM1  (OX_LOCAL_OBJECT+1)
 
 /* cmo_tags */
 
-#define CMO_LARGE_ID	0x7f000000
+#define CMO_LARGE_ID  0x7f000000
 
-#define CMO_ERROR			CMO_LARGE_ID+1
-#define CMO_ERROR2			CMO_LARGE_ID+2
+#define CMO_ERROR      CMO_LARGE_ID+1
+#define CMO_ERROR2      CMO_LARGE_ID+2
 
-#define CMO_NULL			1
-#define CMO_INT32			2
-#define CMO_DATUM			3
-#define CMO_STRING			4
-#define CMO_MATHCAP			5
+#define CMO_NULL      1
+#define CMO_INT32      2
+#define CMO_DATUM      3
+#define CMO_STRING      4
+#define CMO_MATHCAP      5
 
-#define CMO_ARRAY				16
-#define CMO_LIST				17
-#define CMO_ATOM				18
-#define CMO_MONOMIAL32			19
-#define CMO_ZZ					20
-#define CMO_QQ					21
-#define CMO_ZERO				22
+#define CMO_ARRAY        16
+#define CMO_LIST        17
+#define CMO_ATOM        18
+#define CMO_MONOMIAL32      19
+#define CMO_ZZ          20
+#define CMO_QQ          21
+#define CMO_ZERO        22
 
-#define CMO_DMS_GENERIC			24
-#define CMO_DMS_OF_N_VARIABLES	25
-#define CMO_RING_BY_NAME		26
-#define CMO_RECURSIVE_POLYNOMIAL		27
+#define CMO_DMS_GENERIC      24
+#define CMO_DMS_OF_N_VARIABLES  25
+#define CMO_RING_BY_NAME    26
+#define CMO_RECURSIVE_POLYNOMIAL    27
 
-#define CMO_DISTRIBUTED_POLYNOMIAL		31
-#define CMO_UNIVARIATE_POLYNOMIAL		33
-#define CMO_RATIONAL		34
+#define CMO_DISTRIBUTED_POLYNOMIAL    31
+#define CMO_UNIVARIATE_POLYNOMIAL    33
+#define CMO_RATIONAL    34
+#define CMO_COMPLEX    35
 
 #define CMO_64BIT_MACHINE_DOUBLE   40
 #define CMO_ARRAY_OF_64BIT_MACHINE_DOUBLE  41
 #define CMO_128BIT_MACHINE_DOUBLE   42
 #define CMO_ARRAY_OF_128BIT_MACHINE_DOUBLE  43
 
-#define CMO_BIGFLOAT				50
-#define CMO_IEEE_DOUBLE_FLOAT		51
+#define CMO_BIGFLOAT        50
+#define CMO_IEEE_DOUBLE_FLOAT    51
+#define CMO_BIGFLOAT32        52
 
-#define CMO_INDETERMINATE		60
-#define CMO_TREE				61
-#define CMO_LAMBDA				62
+#define CMO_INDETERMINATE    60
+#define CMO_TREE        61
+#define CMO_LAMBDA        62
 
 /* asir local object id */
 
-#define ASIR_VL					0
-#define ASIR_OBJ				1
+#define ASIR_VL          0
+#define ASIR_OBJ        1
 
 /* commands */
 
@@ -136,22 +138,32 @@
 #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
-#define SM_control_intr 				1025
-#define SM_control_reset_connection		1030
+/* 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
+
 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)
-#elif defined(VISUAL)
+#elif defined(VISUAL) || defined(__MINGW32__)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->p < (fp)->buf_size)
 #elif defined(hpux)
 #define FP_DATA_IS_AVAILABLE(fp) ((fp)->__cnt)
@@ -169,6 +181,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 +203,8 @@ 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_complex(FILE *s,C *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 +219,46 @@ 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_complex(FILE *s,C q);
 void write_cmo_uint(FILE *s,USINT ui);
+void write_cmo_matrix_as_list(FILE *s,MAT m);
 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 +283,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 +292,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);
@@ -277,14 +310,15 @@ void init_socket();
 int get_fd(int index);
 int get_index(int fd);
 void ox_launch_generic(char *host,char *launcher,char *server,
-		int use_unix,int use_ssh,int use_x,int conn_to_serv,Q *rp);
+    int use_unix,int use_ssh,int use_x,int conn_to_serv,Q *rp);
 void spawn_server(char *host,char *launcher,char *server,
-	int use_unix,int use_ssh,int use_x,int conn_to_serv,
-	char *control_port_str,char *server_port_str);
+  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();
+int register_102(int s1,int rank,int is_master);
 
 /* library functions */
 void asir_ox_push_cmo(void *);
@@ -293,4 +327,4 @@ void asir_ox_push_cmd(int);
 void asir_ox_execute_string(char *);
 int asir_ox_peek_cmo_size();
 int asir_ox_init(int);
-
+int no_ox_reset(int s);