=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/Attic/ox.c,v retrieving revision 1.6 retrieving revision 1.10 diff -u -p -r1.6 -r1.10 --- OpenXM/src/ox_math/Attic/ox.c 1999/11/04 03:05:50 1.6 +++ OpenXM/src/ox_math/Attic/ox.c 1999/11/05 12:34:25 1.10 @@ -1,5 +1,5 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.5 1999/11/03 10:56:40 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/ox.c,v 1.9 1999/11/04 19:33:17 ohara Exp $ */ /* 関数の名前付け規約(その2): @@ -57,16 +57,22 @@ static int dump_mpz(mpz_ptr mpz); static int funcs(int cmo_type); -/* CMO_xxx の値順にならべること(デバッグのため) */ static int login_with_otp(int fd, char* passwd); +static char *create_otp(); + +/* CMO_xxx の値順にならべること(デバッグのため) */ static cmo_null* receive_cmo_null(int fd); static cmo_int32* receive_cmo_int32(int fd); static cmo_string* receive_cmo_string(int fd); static cmo_mathcap* receive_cmo_mathcap(int fd); static cmo_list* receive_cmo_list(int fd); +static cmo_monomial32* receive_cmo_monomial32(int fd); static cmo_zz* receive_cmo_zz(int fd); static cmo_zero* receive_cmo_zero(int fd); -static cmo_dms_generic* receive_cmo_dms_generic(int fd); +static cmo_dms_generic* receive_cmo_dms_generic(int fd); +static cmo_ring_by_name* receive_cmo_ring_by_name(int fd); +static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(int fd); + static cmo_error2* receive_cmo_error2(int fd); static void receive_mpz(int fd, mpz_ptr mpz); @@ -75,11 +81,12 @@ static int send_cmo_int32(int fd, cmo_int32* static int send_cmo_string(int fd, cmo_string* m); static int send_cmo_mathcap(int fd, cmo_mathcap* c); static int send_cmo_list(int fd, cmo_list* c); +static int send_cmo_monomial32(int fd, cmo_monomial32* c); static int send_cmo_zz(int fd, cmo_zz* c); static int send_cmo_error2(int fd, cmo_error2* c); static int send_mpz(int fd, mpz_ptr mpz); +static int send_cmo_distributed_polynomial(int fd, cmo_distributed_polynomial* c); - /* エラーハンドリングのため */ static int current_received_serial = 0; @@ -135,13 +142,12 @@ int send_ox_tag(int fd, int tag) return send_int32(fd, next_serial()); } - /* CMO_LIST 関係の関数群 */ -cell* new_cell(cmo* newcmo) +cell* new_cell() { cell* h = malloc(sizeof(cell)); h->next = NULL; - h->cmo = newcmo; + h->cmo = NULL; return h; } @@ -150,28 +156,28 @@ cell* next_cell(cell* this) return this->next; } -static cell* *tailp(cmo_list* this) { - cell **cp = &this->head; - while (*cp != NULL) { - cp = &((*cp)->next); +static cell *tail(cmo_list* this) { + cell *cp = this->head; + while (cp->next != NULL) { + cp = cp->next; } return cp; } -int length_cmo_list(cmo_list* this) -{ - return this->length; -} - int append_cmo_list(cmo_list* this, cmo* newcmo) { - /* リストの最後尾のNULLを保持している変数へのポインタ */ - cell **cp = tailp(this); - *cp = new_cell(newcmo); + cell *cp = tail(this); + cp->cmo = newcmo; + cp->next = new_cell(); this->length++; return 0; } +int length_cmo_list(cmo_list* this) +{ + return this->length; +} + /** receive_cmo_XXX 関数群 **/ static cmo_null* receive_cmo_null(int fd) { @@ -203,18 +209,31 @@ static cmo_mathcap* receive_cmo_mathcap(int fd) static cmo_list* receive_cmo_list(int fd) { - cmo* newcmo; + cmo* ob; cmo_list* c = new_cmo_list(); int len = receive_int32(fd); while (len>0) { - newcmo = receive_cmo(fd); - append_cmo_list(c, newcmo); + ob = receive_cmo(fd); + append_cmo_list(c, ob); len--; } return c; } +static cmo_monomial32* receive_cmo_monomial32(int fd) +{ + int i; + int len = receive_int32(fd); + cmo_monomial32* c = new_cmo_monomial32(len); + + for(i=0; iexps[i] = receive_int32(fd); + } + c->coef = receive_cmo(fd); + return c; +} + static cmo_zz* receive_cmo_zz(int fd) { cmo_zz* c = new_cmo_zz(); @@ -239,12 +258,82 @@ static cmo_ring_by_name* receive_cmo_ring_by_name(int return new_cmo_ring_by_name(ob); } +static cmo_distributed_polynomial* receive_cmo_distributed_polynomial(int fd) +{ + cmo* ob; + cmo_distributed_polynomial* c = new_cmo_distributed_polynomial(); + int len = receive_int32(fd); + c->ringdef = receive_cmo(fd); + + while (len>0) { + ob = receive_cmo(fd); + append_cmo_list(c, ob); + len--; + } + return c; +} + static cmo_error2* receive_cmo_error2(int fd) { cmo* ob = receive_cmo(fd); return new_cmo_error2(ob); } +/* receive_ox_tag() == OX_DATA の後に呼び出される */ +/* 関数ポインタを使った方がきれいに書けるような気がする. */ +/* if (foo[tag] != NULL) foo[tag](fd); とか */ + +cmo* receive_cmo(int fd) +{ + cmo* m; + int tag; + tag = receive_int32(fd); + + switch(tag) { + case CMO_NULL: + m = receive_cmo_null(fd); + break; + case CMO_INT32: + m = (cmo *)receive_cmo_int32(fd); + break; + case CMO_STRING: + m = (cmo *)receive_cmo_string(fd); + break; + case CMO_MATHCAP: + m = (cmo *)receive_cmo_mathcap(fd); + break; + case CMO_LIST: + m = (cmo *)receive_cmo_list(fd); + break; + case CMO_MONOMIAL32: + m = (cmo *)receive_cmo_monomial32(fd); + break; + case CMO_ZZ: + m = (cmo *)receive_cmo_zz(fd); + break; + case CMO_ZERO: + m = (cmo *)receive_cmo_zero(fd); + break; + case CMO_DMS_GENERIC: + m = (cmo *)receive_cmo_dms_generic(fd); + break; + case CMO_RING_BY_NAME: + m = (cmo *)receive_cmo_ring_by_name(fd); + break; + case CMO_DISTRIBUTED_POLYNOMIAL: + m = (cmo *)receive_cmo_distributed_polynomial(fd); + break; + case CMO_ERROR2: + m = (cmo *)receive_cmo_error2(fd); + break; + case CMO_DATUM: + case CMO_QQ: + default: + fprintf(stderr, "unknown cmo-type: tag = (%d)\n", m->tag); + } + return m; +} + static void receive_mpz(int fd, mpz_ptr mpz) { int i; @@ -306,7 +395,7 @@ cmo_list* new_cmo_list() cmo_list* c = malloc(sizeof(cmo_list)); c->tag = CMO_LIST; c->length = 0; - c->head = NULL; + c->head->next = NULL; return c; } @@ -398,7 +487,7 @@ cmo_distributed_polynomial* new_cmo_distributed_polyno cmo_distributed_polynomial* c = malloc(sizeof(cmo_distributed_polynomial)); c->tag = CMO_DISTRIBUTED_POLYNOMIAL; c->length = 0; - c->head = NULL; + c->head->next = NULL; c->ringdef = NULL; return c; } @@ -411,48 +500,6 @@ cmo_error2* new_cmo_error2(cmo* ob) return c; } -/* receive_ox_tag() == OX_DATA の後に呼び出される */ -/* 関数ポインタを使った方がきれいに書けるような気がする. */ -/* if (foo[tag] != NULL) foo[tag](fd); とか */ - -cmo* receive_cmo(int fd) -{ - cmo* m; - int tag; - tag = receive_int32(fd); - - switch(tag) { - case CMO_NULL: - m = receive_cmo_null(fd); - break; - case CMO_INT32: - m = (cmo *)receive_cmo_int32(fd); - break; - case CMO_STRING: - m = (cmo *)receive_cmo_string(fd); - break; - case CMO_MATHCAP: - m = (cmo *)receive_cmo_mathcap(fd); - break; - case CMO_LIST: - m = (cmo *)receive_cmo_list(fd); - break; - case CMO_ZZ: - m = (cmo *)receive_cmo_zz(fd); - break; - case CMO_ERROR2: - m = (cmo *)receive_cmo_error2(fd); - break; - case CMO_DATUM: - case CMO_QQ: - case CMO_ZERO: - case CMO_DMS: - default: - fprintf(stderr, "unknown cmo-type: tag = (%d)\n", m->tag); - } - return m; -} - void send_ox_command(int fd, int sm_command) { send_ox_tag(fd, OX_COMMAND); @@ -516,7 +563,7 @@ void ox_close(ox_file_t sv) send_ox_command(sv->control, SM_control_kill); #if DEBUG sleep(2); /* OpenXM server の終了を待つ. あまり意味はない. */ - fprintf(stderr, "I have closed an Open XM server.\n"); + fprintf(stderr, "I have closed the connection to an Open XM server.\n"); #endif } @@ -566,26 +613,33 @@ static char *create_otp() static int login_with_otp(int fd, char* passwd) { char buff[1024]; - int n = read(fd, buff, 1024); int len = strlen(passwd)+1; - if (n != len) { + int n = read(fd, buff, len); + if (strcmp(passwd, buff) != 0) { fprintf(stderr, "Socket#%d: Login incorrect.\n", fd); - fprintf(stderr, "password = (%s), length = (%d).\n", passwd, len); - fprintf(stderr, "received = (%d), length = (%d).\n", buff, n); + fprintf(stderr, "password = (%s), %d bytes.\n", passwd, len); + fprintf(stderr, "received = (%s), %d bytes.\n", buff, n); fflush(stderr); + exit(1); } +#ifdef DEBUG + fprintf(stderr, "Socket#%d: login!.\n", fd); + fprintf(stderr, "password = (%s), %d bytes.\n", passwd, len); + fprintf(stderr, "received = (%s), %d bytes.\n", buff, n); + fflush(stderr); +#endif } /* (-reverse 版の ox_start) ox_start は クライアントが呼び出すための関数である. - サーバでは使われない. prog1 は コントロールサーバであり, + サーバでは使われない. ctl_prog は コントロールサーバであり, -ox, -reverse, -data, -control, -pass, -host - というオプションを理解することを仮定する. prog2 は計算サーバである. + というオプションを理解することを仮定する. dat_prog は計算サーバである. 接続時には, sv->control を先にオープンする. */ -ox_file_t ox_start(char* host, char* prog1, char* prog2) +ox_file_t ox_start(char* host, char* ctl_prog, char* dat_prog) { char *pass = create_otp(); char ctl[16], dat[16]; @@ -601,7 +655,7 @@ ox_file_t ox_start(char* host, char* prog1, char* prog if (fork() == 0) { dup2(2, 1); dup2(open(DEFAULT_LOGFILE, O_RDWR|O_CREAT|O_TRUNC, 0644), 2); - execl(prog1, prog1, "-reverse", "-ox", prog2, + execl(ctl_prog, ctl_prog, "-reverse", "-ox", dat_prog, "-data", dat, "-control", ctl, "-pass", pass, "-host", host, NULL); } @@ -632,9 +686,14 @@ ox_file_t ox_start_insecure_nonreverse(char* host, sho ox_file_t sv = malloc(sizeof(__ox_file_struct)); sv->control = mysocketOpen(host, portControl); +#if 0 + /* ox は insecure のとき byte order の決定が正しくできないようだ... */ + decideByteOrderClient(sv->control, 0); +#endif /* 10マイクロ秒, 時間稼ぎする. */ usleep(10); sv->stream = mysocketOpen(host, portStream); + decideByteOrderClient(sv->stream, 0); return sv; } @@ -682,10 +741,10 @@ static int cmolen_cmo_mathcap(cmo_mathcap* c) static int cmolen_cmo_list(cmo_list* c) { - int size = sizeof(c->head); + int size = sizeof(int); cell* cp = c->head; - while(cp != NULL) { + while(cp->next != NULL) { size += cmolen_cmo(cp->cmo); cp = cp->next; } @@ -728,6 +787,7 @@ int cmolen_cmo(cmo* c) break; case CMO_MATHCAP: case CMO_RING_BY_NAME: + case CMO_INDETERMINATE: case CMO_ERROR2: size += cmolen_cmo_mathcap((cmo_mathcap *)c); break; @@ -785,7 +845,7 @@ static int dump_cmo_list(cmo_list* m) int len = length_cmo_list(m); dump_integer(len); - while(cp != NULL) { + while(cp->next != NULL) { dump_cmo(cp->cmo); cp = cp->next; } @@ -837,6 +897,7 @@ int dump_cmo(cmo* m) break; case CMO_MATHCAP: case CMO_RING_BY_NAME: + case CMO_INDETERMINATE: case CMO_ERROR2: dump_cmo_mathcap((cmo_mathcap *)m); break; @@ -952,16 +1013,43 @@ static int send_cmo_list(int fd, cmo_list* c) int len = length_cmo_list(c); send_int32(fd, len); - while(cp != NULL) { + while(cp->next != NULL) { send_cmo(fd, cp->cmo); cp = cp->next; } return 0; } +static int send_cmo_distributed_polynomial(int fd, cmo_distributed_polynomial* c) +{ + cell* cp = c->head; + int len = length_cmo_list((cmo_list *)c); + send_int32(fd, len); + send_cmo(fd, c->ringdef); + + while(cp->next != NULL) { + send_cmo(fd, cp->cmo); + cp = cp->next; + } + return 0; +} + +static int send_cmo_monomial32(int fd, cmo_monomial32* c) +{ + int i; + int len = c->length; + send_int32(fd, len); + for(i=0; iexps[i]); + } + send_cmo(fd, c->coef); + return 0; +} + static int send_cmo_zz(int fd, cmo_zz* c) { send_mpz(fd, c->mpz); + return 0; } static int send_cmo_error2(int fd, cmo_error2* c) @@ -978,6 +1066,8 @@ int send_cmo(int fd, cmo* c) send_int32(fd, tag); switch(tag) { case CMO_NULL: + case CMO_ZERO: + case CMO_DMS_GENERIC: send_cmo_null(fd, c); /* 空の関数 */ break; case CMO_INT32: @@ -987,16 +1077,22 @@ int send_cmo(int fd, cmo* c) send_cmo_string(fd, (cmo_string *)c); break; case CMO_MATHCAP: + case CMO_ERROR2: + case CMO_RING_BY_NAME: + case CMO_INDETERMINATE: send_cmo_mathcap(fd, (cmo_mathcap *)c); break; case CMO_LIST: send_cmo_list(fd, (cmo_list *)c); break; + case CMO_MONOMIAL32: + send_cmo_monomial32(fd, (cmo_monomial32 *)c); + break; case CMO_ZZ: send_cmo_zz(fd, (cmo_zz *)c); break; - case CMO_ERROR2: - send_cmo_error2(fd, (cmo_error2 *)c); + case CMO_DISTRIBUTED_POLYNOMIAL: + send_cmo_distributed_polynomial(fd, (cmo_distributed_polynomial *)c); break; default: } @@ -1096,6 +1192,7 @@ void setCmotypeDisable(int type) int i = funcs(type); known_types[i] = -1; } + #if 0 cmo* (*received_funcs[])(int fd) = { NULL, /* gate keeper */