=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v retrieving revision 1.16 retrieving revision 1.26 diff -u -p -r1.16 -r1.26 --- OpenXM/src/ox_toolkit/ox.c 2000/11/28 22:11:13 1.16 +++ OpenXM/src/ox_toolkit/ox.c 2003/08/21 12:44:06 1.26 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.15 2000/10/12 15:53:25 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.25 2003/06/02 10:25:56 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -19,21 +20,22 @@ #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_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp); +static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(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 +43,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); +static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c); +static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c); +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); + /* hook functions. (yet not implemented) */ static hook_t hook_before_send_cmo = NULL; static hook_t hook_after_send_cmo = NULL; @@ -88,7 +95,6 @@ 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); } @@ -140,7 +146,7 @@ static cmo_int32* receive_cmo_int32(OXFILE *oxfp) static cmo_string* receive_cmo_string(OXFILE *oxfp) { int len = receive_int32(oxfp); - char* s = malloc(len+1); + char* s = MALLOC(len+1); memset(s, '\0', len+1); if (len > 0) { oxf_read(s, 1, len, oxfp); @@ -205,6 +211,13 @@ static cmo_ring_by_name* receive_cmo_ring_by_name(OXFI return new_cmo_ring_by_name(ob); } +static cmo_recursive_polynomial* receive_cmo_recursive_polynomial(OXFILE *oxfp) +{ + cmo* ringdef = receive_cmo(oxfp); + cmo* coef = receive_cmo(oxfp); + return new_cmo_recursive_polynomial(ringdef, coef); +} + static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(OXFILE *oxfp) { cmo* ob; @@ -220,20 +233,39 @@ static cmo_distributed_polynomial* receive_cmo_distrib return c; } +static cmo_polynomial_in_one_variable* receive_cmo_polynomial_in_one_variable(OXFILE *oxfp) +{ + cmo* coef; + cmo_polynomial_in_one_variable* c; + int len = receive_int32(oxfp); + int var = receive_int32(oxfp); + int exp; + c = new_cmo_polynomial_in_one_variable(var); + while (len>0) { + exp = receive_int32(oxfp); + coef = receive_cmo(oxfp); + list_append_monomial(c, coef, exp); + len--; + } + return c; +} + static cmo_error2* receive_cmo_error2(OXFILE *oxfp) { cmo* ob = receive_cmo(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; int tag = receive_int32(oxfp); + return receive_cmo_tag(oxfp, tag); +} + +cmo *receive_cmo_tag(OXFILE *oxfp, int tag) +{ + cmo* m; switch(tag) { case CMO_NULL: m = receive_cmo_null(oxfp); @@ -268,6 +300,11 @@ cmo* receive_cmo(OXFILE *oxfp) case CMO_DISTRIBUTED_POLYNOMIAL: m = (cmo *)receive_cmo_distributed_polynomial(oxfp); break; + case CMO_RECURSIVE_POLYNOMIAL: + m = (cmo *)receive_cmo_recursive_polynomial(oxfp); + break; + case CMO_POLYNOMIAL_IN_ONE_VARIABLE: + m = (cmo *)receive_cmo_polynomial_in_one_variable(oxfp); case CMO_ERROR2: m = (cmo *)receive_cmo_error2(oxfp); break; @@ -275,7 +312,7 @@ 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; } @@ -302,11 +339,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) @@ -382,18 +417,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) @@ -471,6 +500,21 @@ static int send_cmo_distributed_polynomial(OXFILE *oxf return 0; } +static int send_cmo_polynomial_in_one_variable(OXFILE *oxfp, cmo_polynomial_in_one_variable* c) +{ + cell* el = list_first(c); + int len = list_length(c); + send_int32(oxfp, len); + send_int32(oxfp, c->var); + + while(!list_endof(c, el)) { + send_cmo(oxfp, el->exp); + send_cmo(oxfp, el->cmo); + el = list_next(el); + } + return 0; +} + static int send_cmo_monomial32(OXFILE *oxfp, cmo_monomial32* c) { int i; @@ -489,6 +533,13 @@ static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c) return 0; } +static int send_cmo_recursive_polynomial(OXFILE *oxfp, cmo_recursive_polynomial* c) +{ + send_cmo(oxfp, c->ringdef); + send_cmo(oxfp, c->coef); + return 0; +} + static int send_cmo_error2(OXFILE *oxfp, cmo_error2* c) { send_cmo(oxfp, c->ob); @@ -533,6 +584,12 @@ void send_cmo(OXFILE *oxfp, cmo* c) case CMO_DISTRIBUTED_POLYNOMIAL: send_cmo_distributed_polynomial(oxfp, (cmo_distributed_polynomial *)c); break; + case CMO_RECURSIVE_POLYNOMIAL: + send_cmo_recursive_polynomial(oxfp, (cmo_recursive_polynomial *)c); + break; + case CMO_POLYNOMIAL_IN_ONE_VARIABLE: + send_cmo_polynomial_in_one_variable(oxfp, (cmo_polynomial_in_one_variable *)c); + break; default: call_hook_after_send_cmo(oxfp, c); } @@ -551,7 +608,7 @@ static int send_mpz(OXFILE *oxfp, mpz_ptr mpz) ox_data* new_ox_data(cmo* c) { - ox_data* m = malloc(sizeof(ox_data)); + ox_data* m = MALLOC(sizeof(ox_data)); m->tag = OX_DATA; m->cmo = c; return m; @@ -559,7 +616,7 @@ ox_data* new_ox_data(cmo* c) ox_command* new_ox_command(int sm_code) { - ox_command* m = malloc(sizeof(ox_command)); + ox_command* m = MALLOC(sizeof(ox_command)); m->tag = OX_COMMAND; m->command = sm_code; return m; @@ -567,7 +624,24 @@ ox_command* new_ox_command(int sm_code) ox_sync_ball* new_ox_sync_ball() { - ox_sync_ball *m = malloc(sizeof(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); + } }