=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/Attic/ox.h,v retrieving revision 1.4 retrieving revision 1.8 diff -u -p -r1.4 -r1.8 --- OpenXM/src/ox_math/Attic/ox.h 1999/11/02 21:15:02 1.4 +++ OpenXM/src/ox_math/Attic/ox.h 1999/11/07 12:12:55 1.8 @@ -1,6 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/ox.h,v 1.3 1999/11/02 18:58:25 ohara Exp $ */ -/* $Id: ox.h,v 1.4 1999/11/02 21:15:02 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/ox.h,v 1.7 1999/11/06 21:39:36 ohara Exp $ */ #ifndef _OX_H_ @@ -32,13 +31,25 @@ YYY_cmo_XXX ´Ø¿ô¤¬½èÍý¤¹¤ë¡£cmo ¤ÎÆâÉô¤Ë cmo_ZZZ ¤Ø¤Î¥ ¤¢¤ë¤È¤­¤Ë¤Ï¡¢¤½¤Î¼ïÎà¤Ë¤è¤é¤º¤Ë YYY_cmo ´Ø¿ô¤ò¸Æ¤Ó½Ð¤¹ */ - #define DEFAULT_LOGFILE "/tmp/result" +/* Open Xm File Descripter */ +typedef int oxfd; + +#if 0 +/* ¤½¤Î¤¦¤Á¤³¤Á¤é¤Ë°Ü¹Ô¤·¤¿¤¤... */ +typedef struct { + int fd_read; + int fd_write; + int byteorder; +} oxfile; +typedef oxfile *oxfd; +#endif + /* ¥µ¡¼¥Ð¡¼¤È¤ÎÄÌ¿®Ï©¤ËÍѤ¤¤ë¥Õ¥¡¥¤¥ë¥Ç¥£¥¹¥¯¥ê¥×¥¿¤Î¥Ú¥¢. */ typedef struct { - int stream; - int control; + oxfd stream; + oxfd control; } __ox_file_struct; typedef __ox_file_struct *ox_file_t; @@ -66,7 +77,7 @@ typedef struct { typedef struct { int tag; - int size; + int size; char *body; } cmo_datum; @@ -92,14 +103,15 @@ typedef struct cell { typedef struct { int tag; int length; /* ¥ê¥¹¥È¤ÎŤµ(ɬÍ×??) */ - cell *head; + cell head[1]; } cmo_list; + typedef struct { - int tag; - int length; - int *exps; - cmo *coef; + int tag; + int length; + int *exps; + cmo *coef; } cmo_monomial32; typedef struct { @@ -109,16 +121,16 @@ typedef struct { typedef struct { int tag; - cmo *num; /* ʬ»Ò (cmo_zz) */ - cmo *den; /* ʬÊì (cmo_zz) */ + cmo *num; /* ʬ»Ò (cmo_zz) */ + cmo *den; /* ʬÊì (cmo_zz) */ } cmo_qq; /* cmo_list ¤ÎÇÉÀ¸. append_cmo_list ¤ò»È¤Ã¤Æ¤è¤¤. */ typedef struct { int tag; - int length; /* number of monomials */ - cell *head; /* a list of monomials */ - cmo *ringdef; + int length; /* number of monomials */ + cell head[1]; /* a list of monomials */ + cmo *ringdef; } cmo_distributed_polynomial; typedef cmo ox; @@ -133,35 +145,35 @@ typedef struct { cmo *cmo; } ox_data; -cell* new_cell(cmo* newcmo); -cmo_null* new_cmo_null(); -cmo_int32* new_cmo_int32(int i); -cmo_string* new_cmo_string(char* s); -cmo_mathcap* new_cmo_mathcap(cmo* ob); -cmo_list* new_cmo_list(); -cmo_monomial32* new_cmo_monomial32(); -cmo_monomial32* new_cmo_monomial32_size(int size); -cmo_zz* new_cmo_zz(); -cmo_zz* new_cmo_zz_size(int size); -cmo_zz* new_cmo_zz_set_si(int integer); -cmo_zz* new_cmo_zz_noinit(); -cmo_zero* new_cmo_zero(); -cmo_dms_generic* new_cmo_dms_generic(); -cmo_ring_by_name* new_cmo_ring_by_name(cmo* ob); +cmo_null* new_cmo_null(); +cmo_int32* new_cmo_int32(int i); +cmo_string* new_cmo_string(char* s); +cmo_mathcap* new_cmo_mathcap(cmo* ob); +cmo_list* new_cmo_list(); +cmo_monomial32* new_cmo_monomial32(); +cmo_monomial32* new_cmo_monomial32_size(int size); +cmo_zz* new_cmo_zz(); +cmo_zz* new_cmo_zz_size(int size); +cmo_zz* new_cmo_zz_set_si(int integer); +cmo_zz* new_cmo_zz_noinit(); +cmo_zero* new_cmo_zero(); +cmo_distributed_polynomial* new_cmo_distributed_polynomial(); +cmo_dms_generic* new_cmo_dms_generic(); +cmo_ring_by_name* new_cmo_ring_by_name(cmo* ob); cmo_indeterminate* new_cmo_indeterminate(cmo* ob); -cmo_error2* new_cmo_error2(cmo* ob); +cmo_error2* new_cmo_error2(cmo* ob); -ox_data* new_ox_data(cmo* c); -ox_command* new_ox_command(int sm_code); +ox_data* new_ox_data(cmo* c); +ox_command* new_ox_command(int sm_code); -cmo_error2* gen_error_object(int err_code); -cmo* make_mathcap_object(int version, char *id_string); +cmo_error2* make_error_object(int err_code, cmo *ob); +cmo* make_mathcap_object(int version, char *id_string); -void resize_mpz(mpz_ptr mpz, int size); -cmo* receive_cmo(int fd); -cmo* receive_cmo2(int fd); -int receive_int32(int fd); -int receive_ox_tag(int fd); +void resize_mpz(mpz_ptr mpz, int size); +cmo* receive_cmo(int fd); +cmo* receive_cmo2(int fd); +int receive_int32(int fd); +int receive_ox_tag(int fd); int send_cmo(int fd, cmo* m); int send_int32(int fd, int integer); @@ -170,7 +182,7 @@ int send_ox_cmo(int fd, cmo* m); void send_ox_command(int fd, int sm_command); int send_ox_tag(int fd, int tag); -int append_cmo_list(cmo_list* this, cmo *newcmo); +int append_cmo_list(cmo_list* this, cmo *ob); int length_cmo_list(cmo_list* this); cell* next_cell(cell *this); int cmolen_cmo(cmo* m); @@ -182,6 +194,7 @@ char* ox_popString(ox_file_t sv, int fd); cmo* ox_pop_cmo(ox_file_t sv, int fd); void ox_reset(ox_file_t sv); ox_file_t ox_start(char* host, char* prog1, char* prog2); +ox_file_t ox_start_insecure_nonreverse(char* host, short portControl, short portStream); int init_dump_buff(char *buff); int dump_cmo(cmo* m); @@ -194,15 +207,15 @@ int print_cmo_list(cmo_list* li); int print_cmo_mathcap(cmo_mathcap* c); int print_cmo_string(cmo_string* c); -int decideByteOrder(int fd_read, int fd_write, int order); -int decideByteOrder2(int fd_read, int fd_write, int order); +int decideByteOrderClient(oxfd fd, int order); +int decideByteOrderServer(oxfd fd, int order); int next_serial(); void setCmotypeDisable(int type); cmo_zz* new_cmo_zz_set_string(char *s); -char* convert_zz_to_cstring(cmo_zz *c); -char* convert_cmo_to_cstring(cmo *m); -char* convert_null_to_cstring(); -char* convert_int_to_cstring(int integer); +char* convert_zz_to_string(cmo_zz *c); +char* convert_cmo_to_string(cmo *m); +char* convert_null_to_string(); +char* convert_int_to_string(int integer); #endif /* _OX_H_ */