=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v retrieving revision 1.15 retrieving revision 1.22 diff -u -p -r1.15 -r1.22 --- OpenXM/src/ox_toolkit/ox.c 2000/10/12 15:53:25 1.15 +++ OpenXM/src/ox_toolkit/ox.c 2003/03/23 20:17:35 1.22 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.14 2000/10/11 06:56:02 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.21 2003/02/04 20:43:55 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -19,21 +20,20 @@ #include "ox_toolkit.h" #include "parse.h" -/* CMO_xxx の値の順にならべること(デバッグのため) */ +static FILE *ox_stderr = NULL; + +/* sorting by the value of CMO_xxx. (for debugging) */ static cmo_null* receive_cmo_null(OXFILE *oxfp); static cmo_int32* receive_cmo_int32(OXFILE *oxfp); static cmo_string* receive_cmo_string(OXFILE *oxfp); static cmo_mathcap* receive_cmo_mathcap(OXFILE *oxfp); static cmo_list* receive_cmo_list(OXFILE *oxfp); static cmo_monomial32* receive_cmo_monomial32(OXFILE *oxfp); -static cmo_zz* receive_cmo_zz(OXFILE *oxfp); static cmo_zero* receive_cmo_zero(OXFILE *oxfp); static cmo_dms_generic* receive_cmo_dms_generic(OXFILE *oxfp); static cmo_ring_by_name* receive_cmo_ring_by_name(OXFILE *oxfp); static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp); - static cmo_error2* receive_cmo_error2(OXFILE *oxfp); -static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz); static int send_cmo_null(OXFILE *oxfp, cmo_null* c); static int send_cmo_int32(OXFILE *oxfp, cmo_int32* m); @@ -41,11 +41,16 @@ static int send_cmo_string(OXFILE *oxfp, cmo_ static int send_cmo_mathcap(OXFILE *oxfp, cmo_mathcap* c); static int send_cmo_list(OXFILE *oxfp, cmo_list* c); static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c); -static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c); static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c); -static int send_mpz(OXFILE *oxfp, mpz_ptr mpz); static int send_cmo_distributed_polynomial(OXFILE *oxfp, cmo_distributed_polynomial* c); +#if defined(WITH_GMP) +static cmo_zz* receive_cmo_zz(OXFILE *oxfp); +static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz); +static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c); +static int send_mpz(OXFILE *oxfp, mpz_ptr mpz); +#endif /* WITH_GMP */ + /* hook functions. (yet not implemented) */ static hook_t hook_before_send_cmo = NULL; static hook_t hook_after_send_cmo = NULL; @@ -88,19 +93,12 @@ cmo_error2* make_error_object(int err_code, cmo *ob) list_append(li, (cmo *)new_cmo_int32(current_received_serial)); list_append(li, (cmo *)new_cmo_int32(err_code)); list_append(li, ob); - /* 他の情報を加えるならココ */ return new_cmo_error2((cmo *)li); } -#define DEFAULT_SERIAL_NUMBER 0x0000ffff -#define receive_serial_number(x) (receive_int32((x))) - /* getting a next serial number. */ int next_serial(OXFILE *oxfp) { -/* - static int serial_number = DEFAULT_SERIAL_NUMBER; -*/ return oxfp->serial_number++; } @@ -120,7 +118,7 @@ int receive_int32(OXFILE *oxfp) int receive_ox_tag(OXFILE *oxfp) { int tag = receive_int32(oxfp); - current_received_serial = receive_serial_number(oxfp); + oxfp->received_serial_number = receive_int32(oxfp); return tag; } @@ -187,12 +185,14 @@ static cmo_monomial32* receive_cmo_monomial32(OXFILE * return c; } +#if defined(WITH_GMP) static cmo_zz* receive_cmo_zz(OXFILE *oxfp) { cmo_zz* c = new_cmo_zz(); receive_mpz(oxfp, c->mpz); return c; } +#endif /* WITH_GMP */ static cmo_zero* receive_cmo_zero(OXFILE *oxfp) { @@ -232,10 +232,7 @@ static cmo_error2* receive_cmo_error2(OXFILE *oxfp) return new_cmo_error2(ob); } -/* receive_ox_tag() == OX_DATA の後に呼び出される */ -/* 関数ポインタを使った方がきれいに書けるような気がする. */ -/* if (foo[tag] != NULL) foo[tag](oxfp); とか */ - +/* receive_cmo() is called after receive_ox_tag(). */ cmo* receive_cmo(OXFILE *oxfp) { cmo* m; @@ -259,9 +256,11 @@ cmo* receive_cmo(OXFILE *oxfp) case CMO_MONOMIAL32: m = (cmo *)receive_cmo_monomial32(oxfp); break; +#if defined(WITH_GMP) case CMO_ZZ: m = (cmo *)receive_cmo_zz(oxfp); break; +#endif /* WITH_GMP */ case CMO_ZERO: m = (cmo *)receive_cmo_zero(oxfp); break; @@ -281,11 +280,12 @@ cmo* receive_cmo(OXFILE *oxfp) case CMO_QQ: default: m = NULL; - fprintf(stderr, "the CMO (%d) is not implemented.\n", tag); + ox_printf("the CMO (%d) is not implemented.\n", tag); } return m; } +#if defined(WITH_GMP) static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz) { int i; @@ -297,6 +297,7 @@ static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz) mpz->_mp_d[i] = receive_int32(oxfp); } } +#endif /* WITH_GMP */ void send_ox_command(OXFILE *oxfp, int sm_command) { @@ -308,11 +309,9 @@ void send_ox_command(OXFILE *oxfp, int sm_command) void ox_close(OXFILE *sv) { send_ox_command(oxf_control(sv), SM_control_kill); -#ifdef DEBUG sleep(2); /* We wait thar an OpenXM server terminates. */ - fprintf(stderr, "I have closed the connection to an Open XM server.\n"); -#endif + ox_printf("I have closed the connection to an Open XM server.\n"); } void ox_shutdown(OXFILE *sv) @@ -388,18 +387,12 @@ int ox_flush(OXFILE *sv) void ox_reset(OXFILE *sv) { send_ox_command(oxf_control(sv), SM_control_reset_connection); - - receive_ox_tag(oxf_control(sv)); /* OX_DATA */ - receive_cmo(oxf_control(sv)); /* (CMO_INT32, 0) */ - while(receive_ox_tag(sv) != OX_SYNC_BALL) { receive_cmo(sv); /* skipping a message. */ } send_ox_tag(sv, OX_SYNC_BALL); -#ifdef DEBUG - fprintf(stderr, "I have reset an Open XM server.\n"); -#endif + ox_printf("I have reset an Open XM server.\n"); } void send_ox(OXFILE *oxfp, ox *m) @@ -489,11 +482,13 @@ static int send_cmo_monomial32(OXFILE *oxfp, cmo_monom return 0; } +#if defined(WITH_GMP) static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c) { send_mpz(oxfp, c->mpz); return 0; } +#endif /* WITH_GMP */ static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c) { @@ -533,9 +528,11 @@ void send_cmo(OXFILE *oxfp, cmo* c) case CMO_MONOMIAL32: send_cmo_monomial32(oxfp, (cmo_monomial32 *)c); break; +#if defined(WITH_GMP) case CMO_ZZ: send_cmo_zz(oxfp, (cmo_zz *)c); break; +#endif /* WITH_GMP */ case CMO_DISTRIBUTED_POLYNOMIAL: send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c); break; @@ -544,6 +541,7 @@ void send_cmo(OXFILE *oxfp, cmo* c) } } +#if defined(WITH_GMP) static int send_mpz(OXFILE *oxfp, mpz_ptr mpz) { int i; @@ -554,6 +552,7 @@ static int send_mpz(OXFILE *oxfp, mpz_ptr mpz) } return 0; } +#endif /* WITH_GMP */ ox_data* new_ox_data(cmo* c) { @@ -576,4 +575,21 @@ ox_sync_ball* new_ox_sync_ball() ox_sync_ball *m = malloc(sizeof(ox_sync_ball)); m->tag = OX_SYNC_BALL; return m; +} + +int ox_stderr_init(FILE *fp) +{ + ox_stderr = fp; + if (ox_stderr != NULL) { + setbuf(ox_stderr, NULL); + } +} + +int ox_printf(char *format, ...) +{ + if (ox_stderr != NULL) { + va_list ap; + va_start(ap, format); + vfprintf(ox_stderr, format, ap); + } }