=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.1 retrieving revision 1.27 diff -u -p -r1.1 -r1.27 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2000/03/10 12:24:39 1.1 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2003/11/12 15:20:18 1.27 @@ -1,37 +1,63 @@ /* -*- mode: C -*- */ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.26 2003/09/18 12:46:08 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ -#include -#include "ox_toolkit_tags.h" +#include +#if defined(WITH_GMP) +#include +#else +#include "gmp_fake.h" +#endif /* WITH_GMP */ -/* functions related to ox.c */ +#ifdef __cplusplus +extern "C" { +#endif -#define LOGFILE "/tmp/oxtk.XXXXXX" +#include +#include +#include +#include -/* Open Xm File Descripter */ -typedef int oxfd; +#define MALLOC(x) GC_MALLOC((x)) +#define MALLOC_ATOMIC(x) GC_MALLOC_ATOMIC((x)) +#define ALLOCA(x) alloca((x)) +/* #define FREE(x) free((x)) */ +#define FREE(x) -#if 0 -typedef struct { - int fd; - int byteorder; -} oxfile; -typedef oxfile *oxfd; +#if !defined(__GNUC__) && !defined(__inline__) +#define __inline__ #endif -/* descripter pair. (needed by a client) */ +/* Mathcap Local Database */ typedef struct { - oxfd stream; - oxfd control; -} __ox_file_struct; + int tag; + int flag; +} table; -typedef __ox_file_struct *ox_file_t; +typedef struct mathcap { + table *cmotbl; + table *smtbl; +} mathcap; -typedef struct { +/* OpenXM File Descripter */ +typedef struct OXFILE{ + int fd; + int (*send_int32)(struct OXFILE *oxfp, int int32); + int (*receive_int32)(struct OXFILE *oxfp); + int serial_number; + int received_serial_number; + struct OXFILE *control; /* pointer to his control server. */ + struct mathcap *mathcap; + int error; + char *wbuf; + int wbuf_size; + int wbuf_count; +} OXFILE; + +typedef struct cmo { int tag; } cmo; @@ -64,9 +90,12 @@ typedef cmo_mathcap cmo_error2; typedef cmo_mathcap cmo_ring_by_name; typedef cmo_mathcap cmo_indeterminate; +/* a double linked list */ typedef struct cell { + struct cmo *cmo; struct cell *next; - cmo *cmo; + struct cell *prev; + int exp; } cell; typedef struct { @@ -75,7 +104,6 @@ typedef struct { cell head[1]; } cmo_list; - typedef struct { int tag; int length; @@ -94,8 +122,13 @@ typedef struct { cmo *den; /* Bunbo (cmo_zz) */ } cmo_qq; +typedef struct { + int tag; + double d; /* machine dependent */ +} cmo_double; + /* The following is a derived class from cmo_list. - that is, append_cmo_list can be used. */ + that is, list_append can be used. */ typedef struct { int tag; int length; /* number of monomials */ @@ -103,6 +136,34 @@ typedef struct { cmo *ringdef; } cmo_distributed_polynomial; +/* The following is a derived class from cmo_list. + that is, list_append can be used. */ +typedef struct { + int tag; + int length; /* number of monomials */ + cell head[1]; /* list of monomials */ + int var; /* name of the main variable */ +} cmo_polynomial_in_one_variable; + +typedef struct { + int tag; + cmo_list *ringdef; /* list of variables */ + cmo *coef; /* ZZ, QQ, int32, Poly_in_1var, Tree, Zero, DPoly */ +} cmo_recursive_polynomial; + +typedef struct { + int tag; + cmo_string *name; + cmo_list *attributes; + cmo_list *leaves; +} cmo_tree; + +typedef struct { + int tag; + cmo_list *args; + cmo_tree *body; +} cmo_lambda; + typedef cmo ox; typedef ox ox_sync_ball; @@ -114,7 +175,7 @@ typedef struct { typedef struct { int tag; - cmo *cmo; + struct cmo *cmo; } ox_data; cmo_null* new_cmo_null(); @@ -131,10 +192,15 @@ cmo_zz* new_cmo_zz_set_mpz(mpz_ptr z); cmo_zz* new_cmo_zz_noinit(); cmo_zz* new_cmo_zz_set_string(char* s); cmo_zero* new_cmo_zero(); +cmo_double* new_cmo_double(double d); 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_polynomial_in_one_variable* new_cmo_polynomial_in_one_variable(int var); +cmo_recursive_polynomial* new_cmo_recursive_polynomial(cmo_list* ringdef, cmo* coef); +cmo_tree* new_cmo_tree(cmo_string* name, cmo_list *attributes, cmo_list *leaves); +cmo_lambda* new_cmo_lambda(cmo_list* args, cmo_tree* body); cmo_error2* new_cmo_error2(cmo* ob); ox_data* new_ox_data(cmo* c); @@ -144,58 +210,56 @@ ox_sync_ball* new_ox_sync_ball(); char* new_string_set_cmo(cmo* m); cmo_error2* make_error_object(int err_code, cmo* ob); -cmo* make_mathcap_object(int version, char *id_string); /* Low level API */ -cmo* receive_cmo(int fd); -int receive_int32(int fd); -int receive_ox_tag(int fd); +cmo* receive_cmo(OXFILE *fp); +cmo* receive_cmo_tag(OXFILE *fp, int tag); +int receive_int32(OXFILE *fp); +int receive_ox_tag(OXFILE *fp); -int send_cmo(int fd, cmo* m); -int send_int32(int fd, int integer); -int send_ox(int fd, ox* m); -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); +void send_cmo(OXFILE *fp, cmo* m); +int send_int32(OXFILE *fp, int integer); +void send_ox(OXFILE *fp, ox* m); +void send_ox_cmo(OXFILE *fp, cmo* m); +void send_ox_command(OXFILE *fp, int sm_command); +int send_ox_tag(OXFILE *fp, int tag); -int decideByteOrderClient(int fd, int order); -int decideByteOrderServer(int fd, int order); int next_serial(); void setCmotypeDisable(int type); -cell* new_cell(); -cmo* nth_cmo_list(cmo_list* this, int n); -int set_current_fd(int fd); /* High level API */ -ox_file_t ox_start(char* host, char* prog1, char* prog2); -ox_file_t ox_start_insecure_nonreverse(char* host, short portControl, short portStream); -ox_file_t ox_start_remote_with_ssh(char *dat_prog, char* host); +void ox_close(OXFILE *sv); +void ox_shutdown(OXFILE *sv); +void ox_reset(OXFILE *sv); +void ox_execute_string(OXFILE *sv, char* str); +cmo_mathcap* ox_mathcap(OXFILE *sv); +char* ox_popString(OXFILE *sv); +void ox_pops(OXFILE *sv, int num); +cmo* ox_pop_cmo(OXFILE *sv); +void ox_push_cmo(OXFILE *sv, cmo *c); +void ox_push_cmd(OXFILE *sv, int sm_code); +void ox_cmo_rpc(OXFILE *sv, char *function, int argc, cmo *argv[]); +int ox_flush(OXFILE *sv); -void ox_close(ox_file_t sv); -void ox_shutdown(ox_file_t sv); -void ox_reset(ox_file_t sv); -void ox_execute_string(ox_file_t sv, char* str); -cmo_mathcap* ox_mathcap(ox_file_t sv); -char* ox_popString(ox_file_t sv); -int ox_pops(ox_file_t sv, int num); -cmo* ox_pop_cmo(ox_file_t sv); -void ox_push_cmo(ox_file_t sv, cmo *c); -void ox_push_cmd(ox_file_t sv, int sm_code); -int ox_cmo_rpc(ox_file_t sv, char *function, int argc, cmo *argv[]); -int ox_flush(ox_file_t sv); +cell* list_first(cmo_list *); +int list_endof(cmo_list *, cell *el); +cell* list_next(cell *el); +cmo_list* list_append(cmo_list*, cmo *ob); +cmo_list* list_append_monomial(cmo_list* , cmo* coef, int exp); +cmo_list* list_appendl(cmo_list*, ...); +int list_length(cmo_list* ); +cmo* list_nth(cmo_list* , int n); -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); -int init_dump_buff(char *buff); -int dump_cmo(cmo* m); -int dump_ox_command(ox_command* m); -int dump_ox_data(ox_data* m); +void dump_buffer_init(char *s); +void dump_cmo(cmo* m); +void dump_ox_command(ox_command* m); +void dump_ox_data(ox_data* m); -int print_cmo(cmo* c); +void print_cmo(cmo* c); +void resize_mpz(mpz_ptr mpz, int size); -typedef cmo *(*hook_t)(int, cmo *); +typedef cmo *(*hook_t)(OXFILE *, cmo *); int add_hook_before_send_cmo(hook_t func); int add_hook_after_send_cmo(hook_t func); @@ -206,14 +270,53 @@ int add_hook_after_send_cmo(hook_t func); typedef struct symbol *symbol_t; -int setflag_parse(int flag); +void setflag_parse(int flag); cmo *parse(); -int init_parser(char *s); +void init_parser(char *s); symbol_t lookup_by_symbol(char *key); symbol_t lookup_by_token(int tok); symbol_t lookup_by_tag(int tag); symbol_t lookup(int i); -char *symbol_get_key(symbol_t sp); +char* get_symbol_by_tag(int tag); + +/* for mathcap database */ +mathcap *new_mathcap(); +void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]); +cmo_mathcap* mathcap_get(mathcap *); +mathcap *mathcap_update(mathcap *, cmo_mathcap *mc); +int mathcap_allowQ_cmo(mathcap *, cmo *ob); + +int oxf_read(void *buffer, size_t size, size_t num, OXFILE *oxfp); +int oxf_write(void *buffer, size_t size, size_t num, OXFILE *oxfp); + +/* for OXFILE */ +int oxf_listen(int *portp); +OXFILE *oxf_connect_active(char *hostname, short port); +OXFILE *oxf_connect_passive(int listened); +OXFILE *oxf_open(int fd); +OXFILE *oxf_control_set(OXFILE *oxfp, OXFILE *control); +OXFILE *oxf_control(OXFILE *oxfp); +int oxf_confirm_client(OXFILE *oxfp, char *passwd); +int oxf_confirm_server(OXFILE *oxfp, char *passwd); +void oxf_flush(OXFILE *oxfp); +void oxf_close(OXFILE *oxfp); +void oxf_setopt(OXFILE *oxfp, int mode); +void oxf_determine_byteorder_client(OXFILE *oxfp); +void oxf_determine_byteorder_server(OXFILE *oxfp); +OXFILE *oxf_execute_cmd(OXFILE *oxfp, char *cmd); +cmo_mathcap *oxf_cmo_mathcap(OXFILE *oxfp); +void oxf_mathcap_update(OXFILE *oxfp, cmo_mathcap *ob); + +/* example: which("xterm", getenv("PATH")); */ +char *which(char *exe, const char *env); +char *generate_otp(); + +int ox_stderr_init(FILE *fp); +int ox_printf(char *format, ...); + +#ifdef __cplusplus +} +#endif #endif /* _OX_TOOLKIT_H_ */