=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/mathcap.c,v retrieving revision 1.1 retrieving revision 1.10 diff -u -p -r1.1 -r1.10 --- OpenXM/src/ox_toolkit/mathcap.c 2000/10/10 05:23:20 1.1 +++ OpenXM/src/ox_toolkit/mathcap.c 2003/09/15 09:31:41 1.10 @@ -1,47 +1,54 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM$ */ +/* $OpenXM: OpenXM/src/ox_toolkit/mathcap.c,v 1.9 2003/06/02 10:25:56 ohara Exp $ */ /* This module includes functions for handling mathcap databases. */ #include +#include #include "ox_toolkit.h" -typedef struct { - int tag; - int flag; -} mc_cell; +#define MATHCAP_FLAG_DENY 0 +#define MATHCAP_FLAG_ALLOW 1 -static int mathcap_cmo_isallow_tag(int tag); -static mc_cell *mathcap_cmo_lookup(int tag); -static int mathcap_cmo_isallow_cmo_list(cmo_list *ob); -static int mathcap_cmo_isallow_cmo_monomial32(cmo_monomial32 *ob); -static int mathcap_cmo_isallow_cmo_mathcap(cmo_mathcap *ob); +static void table_init(table *m, int key); +static table *new_table(int *src); +static table *table_lookup(table *tbl, int tag); +static void table_ctl(table *tbl, int tag, int flag); +static void table_ctl_all(table *tbl, int flag); +static cmo_list *table_get_all(table *tbl); +static void table_allow(table *tbl, int tag); +static void table_deny(table *tbl, int tag); +static void table_update(table *cmotbl, cmo_list* types); +static int table_allowQ_tag(table *tbl, int tag); +static int table_allowQ_cmo_list(table *cmotbl, cmo_list *ob); +static int table_allowQ_cmo_monomial32(table *cmotbl, cmo_monomial32 *ob); +static int table_allowQ_cmo_mathcap(table *cmotbl, cmo_mathcap *ob); +static int table_allowQ_cmo(table *cmotbl, cmo *ob); +static cmo_list *sysinfo_get(); static char *new_string(char *s); -static void mathcap_cmo_update(cmo_list* types); +static int *new_int_array(int *array); static cmo_list *get_messagetypes(cmo_list *ob, int type); static cmo_list *cmo_mathcap_get_cmotypes(cmo_mathcap *mc); -static cmo_list *get_messagetypes(cmo_list *ob, int type); -static cmo_list *cmo_mathcap_get_cmotypes(cmo_mathcap *mc); -static mc_cell mathcap_cmo[] = { - {CMO_NULL, MATHCAP_FLAG_ALLOW}, - {CMO_INT32, MATHCAP_FLAG_ALLOW}, - {CMO_DATUM, MATHCAP_FLAG_ALLOW}, - {CMO_STRING, MATHCAP_FLAG_ALLOW}, - {CMO_MATHCAP, MATHCAP_FLAG_ALLOW}, - {CMO_LIST, MATHCAP_FLAG_ALLOW}, - {CMO_MONOMIAL32, MATHCAP_FLAG_ALLOW}, - {CMO_ZZ, MATHCAP_FLAG_ALLOW}, - {CMO_ZERO, MATHCAP_FLAG_ALLOW}, - {CMO_DMS_GENERIC, MATHCAP_FLAG_ALLOW}, - {CMO_RING_BY_NAME, MATHCAP_FLAG_ALLOW}, - {CMO_INDETERMINATE, MATHCAP_FLAG_ALLOW}, - {CMO_DISTRIBUTED_POLYNOMIAL, MATHCAP_FLAG_ALLOW}, - {CMO_ERROR2, MATHCAP_FLAG_ALLOW}, - {0, MATHCAP_FLAG_DENY} +static int cmotbl_a[] = { + CMO_NULL, + CMO_INT32, + CMO_DATUM, + CMO_STRING, + CMO_MATHCAP, + CMO_LIST, + CMO_MONOMIAL32, + CMO_ZZ, + CMO_ZERO, + CMO_DMS_GENERIC, + CMO_RING_BY_NAME, + CMO_INDETERMINATE, + CMO_DISTRIBUTED_POLYNOMIAL, + CMO_ERROR2, + 0, }; -static int mathcap_sm[] = { +static int smtbl_a[] = { SM_popCMO, SM_popString, SM_mathcap, @@ -52,7 +59,9 @@ static int mathcap_sm[] = { SM_shutdown, SM_control_kill, SM_control_reset_connection, - 0 + SM_control_spawn_server, + SM_control_terminate_server, + 0, }; static struct { @@ -60,197 +69,222 @@ static struct { char *version_string; char *sysname; char *hosttype; -} mathcap_sysinfo = {0, "NO VERSION", "NONAME", "UNKNOWN"}; + int *cmo_tags; + int *sm_cmds; +} sysinfo = {0, "NO VERSION", "NONAME", "UNKNOWN", cmotbl_a, smtbl_a}; -/* 次の tag をもつ cmo の送信が許可されているかを調べる */ -static int mathcap_cmo_isallow_tag(int tag) +__inline__ +static void table_init(table *m, int key) { - mc_cell *e = mathcap_cmo; - while (e->tag != 0 && e->tag != tag) { - e++; - } - return e->flag; + m->tag = key; + m->flag = MATHCAP_FLAG_ALLOW; } -/* 次の tag についてのキーを探す */ -static mc_cell *mathcap_cmo_lookup(int tag) +static table *new_table(int *src) { - mc_cell *e = mathcap_cmo; - while (e->tag != 0) { - if (e->tag == tag) { - return e; - } - e++; + table *new; + int len=0; + int i; + while (src[len++] != 0) { } - return NULL; + new = MALLOC(sizeof(table)*len); + for(i=0; itag)) { - el = list_first(ob); - while (!list_endof(ob, el)) { - if (!mathcap_cmo_isallow_cmo(el->cmo)) { - return MATHCAP_FLAG_DENY; - } - el = list_next(el); + while (tbl->tag != 0) { + if (tbl->tag == tag) { + return tbl; } - return MATHCAP_FLAG_ALLOW; + tbl++; } - return MATHCAP_FLAG_DENY; + return NULL; } -static int mathcap_cmo_isallow_cmo_monomial32(cmo_monomial32 *ob) +/* controller about a cmo identified by the tag */ +static void table_ctl(table *tbl, int tag, int flag) { - return mathcap_cmo_isallow_tag(ob->tag) - && mathcap_cmo_isallow_cmo(ob->coef); + table *e = table_lookup(tbl, tag); + if (e != NULL) { + e->flag = flag; + } } -static int mathcap_cmo_isallow_cmo_mathcap(cmo_mathcap *ob) +/* controller about all CMObjects */ +static void table_ctl_all(table *tbl, int flag) { - return mathcap_cmo_isallow_tag(ob->tag) - && mathcap_cmo_isallow_cmo(ob->ob); + while (tbl->tag != 0) { + tbl->flag = flag; + tbl++; + } } -/* 次の cmo の送信が許可されているかを調べる */ -int mathcap_cmo_isallow_cmo(cmo *ob) +/* getting the list of tags of all allowed objects */ +static cmo_list *table_get_all(table *tbl) { - int tag = ob->tag; - switch(tag) { - case CMO_LIST: - case CMO_DISTRIBUTED_POLYNOMIAL: - return mathcap_cmo_isallow_cmo_list((cmo_list *)ob); - case CMO_MATHCAP: - case CMO_ERROR2: - case CMO_RING_BY_NAME: - case CMO_INDETERMINATE: - return mathcap_cmo_isallow_cmo_mathcap((cmo_mathcap *)ob); - case CMO_MONOMIAL32: - return mathcap_cmo_isallow_cmo_monomial32((cmo_monomial32 *)ob); - default: - return mathcap_cmo_isallow_tag(tag); + cmo_list *list = new_cmo_list(); + while (tbl->tag != 0) { + if (tbl->flag == MATHCAP_FLAG_ALLOW) { + list_append(list, (cmo *)new_cmo_int32(tbl->tag)); + } + tbl++; } + return list; } -/* 次の tag をもつ cmo の送信を許可する */ -void mathcap_cmo_allow(int tag) +/* giving a permssion to send objects identified by the tag. */ +__inline__ +static void table_allow(table *tbl, int tag) { - mc_cell *e = mathcap_cmo_lookup(tag); - if (e != NULL) { - e->flag = MATHCAP_FLAG_ALLOW; - } + table_ctl(tbl, tag, MATHCAP_FLAG_ALLOW); } -/* 次の tag をもつ cmo の送信を不許可にする */ -void mathcap_cmo_deny(int tag) +/* taking a permssion to send objects identified by the tag. */ +__inline__ +static void table_deny(table *tbl, int tag) { - mc_cell *e = mathcap_cmo_lookup(tag); - if (e != NULL) { - e->flag = MATHCAP_FLAG_DENY; - } + table_ctl(tbl, tag, MATHCAP_FLAG_DENY); } -/* 全ての種類の cmo の送信を不許可にする */ -void mathcap_cmo_deny_all() +static void table_update(table *cmotbl, cmo_list* types) { - mc_cell *e = mathcap_cmo; - while (e->tag != 0) { - e->flag = MATHCAP_FLAG_DENY; - e++; + cell *el = list_first(types); + cmo_int32 *ob; + while(!list_endof(types, el)) { + ob = (cmo_int32 *)el->cmo; + if (ob->tag == CMO_INT32) { + table_allow(cmotbl, ob->i); + } + el = list_next(el); } } -/* 全ての種類の cmo の送信を許可する */ -void mathcap_cmo_allow_all() +/* getting a permission to send objects identified by the tag. */ +static int table_allowQ_tag(table *tbl, int tag) { - mc_cell *e = mathcap_cmo; - while (e->tag != 0) { - e->flag = MATHCAP_FLAG_ALLOW; - e++; + while (tbl->tag != 0 && tbl->tag != tag) { + tbl++; } + return tbl->flag; } -/* 送信許可されている cmo のリストを得る */ -cmo_list *mathcap_cmo_get_allow_all() +static int table_allowQ_cmo_list(table *cmotbl, cmo_list *ob) { - cmo_list *list = new_cmo_list(); - mc_cell *e = mathcap_cmo; - while (e->tag != 0) { - if (e->flag != MATHCAP_FLAG_DENY) { - list_append(list, new_cmo_int32(e->tag)); + cell *el; + if (table_allowQ_tag(cmotbl, ob->tag)) { + el = list_first(ob); + while (!list_endof(ob, el)) { + if (!table_allowQ_cmo(cmotbl, el->cmo)) { + return MATHCAP_FLAG_DENY; + } + el = list_next(el); } - e++; + return MATHCAP_FLAG_ALLOW; } - return list; + return MATHCAP_FLAG_DENY; } -/* 既知の sm コマンドのリストを得る */ -cmo_list *mathcap_sm_get_all() +__inline__ +static int table_allowQ_cmo_monomial32(table *cmotbl, cmo_monomial32 *ob) { - cmo_list *list = new_cmo_list(); - int i; - for(i=0; mathcap_sm[i] != 0; i++) { - list_append(list, new_cmo_int32(mathcap_sm[i])); + return table_allowQ_tag(cmotbl, ob->tag) + && table_allowQ_cmo(cmotbl, ob->coef); +} + +__inline__ +static int table_allowQ_cmo_mathcap(table *cmotbl, cmo_mathcap *ob) +{ + return table_allowQ_tag(cmotbl, ob->tag) + && table_allowQ_cmo(cmotbl, ob->ob); +} + +/* getting a permission to send the following object. */ +static int table_allowQ_cmo(table *cmotbl, cmo *ob) +{ + int tag = ob->tag; + switch(tag) { + case CMO_LIST: + case CMO_DISTRIBUTED_POLYNOMIAL: + return table_allowQ_cmo_list(cmotbl, (cmo_list *)ob); + case CMO_MATHCAP: + case CMO_ERROR2: + case CMO_RING_BY_NAME: + case CMO_INDETERMINATE: + return table_allowQ_cmo_mathcap(cmotbl, (cmo_mathcap *)ob); + case CMO_MONOMIAL32: + return table_allowQ_cmo_monomial32(cmotbl, (cmo_monomial32 *)ob); + default: + return table_allowQ_tag(cmotbl, tag); } - return list; } -/* システム情報を得る */ -cmo_list *mathcap_sysinfo_get_all() +/* getting the System Information */ +static cmo_list *sysinfo_get() { cmo_list *syslist = new_cmo_list(); - cmo_int32 *ver = new_cmo_int32(mathcap_sysinfo.version); - cmo_string *vers = new_cmo_string(mathcap_sysinfo.version_string); - cmo_string *host = new_cmo_string(mathcap_sysinfo.hosttype); - cmo_string *sname = new_cmo_string(mathcap_sysinfo.sysname); - return list_appendl(syslist, ver, sname, vers, host); + cmo_int32 *ver = new_cmo_int32(sysinfo.version); + cmo_string *vers = new_cmo_string(sysinfo.version_string); + cmo_string *host = new_cmo_string(sysinfo.hosttype); + cmo_string *sname = new_cmo_string(sysinfo.sysname); + return list_appendl(syslist, ver, sname, vers, host, NULL); } static char *new_string(char *s) { - char *t = malloc(sizeof(s)+1); + char *t = MALLOC(strlen(s)+1); strcpy(t, s); return t; } -void mathcap_sysinfo_set(int version, char *version_string, char *sysname) +static int *new_int_array(int *array) { - char *host = getenv("HOSTTYPE"); - - mathcap_sysinfo.hosttype = (host != NULL)? new_string(host): "UNKNOWN"; - mathcap_sysinfo.sysname = new_string(sysname); - mathcap_sysinfo.version_string = new_string(version_string); - mathcap_sysinfo.version = version; + int *new_array; + int length = 0; + while(array[length++] != 0) + ; + new_array = MALLOC(sizeof(int)*length); + return memcpy(new_array, array, sizeof(int)*length); } -/* データベースから cmo_mathcap を生成する */ -cmo_mathcap* mathcap_get() +void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]) { - cmo_list *mc = new_cmo_list(); - cmo_list *l3 = new_cmo_list(); - list_append(l3, list_appendl(new_cmo_list(), new_cmo_int32(OX_DATA), mathcap_cmo_get_allow_all(), NULL)); - list_appendl(mc, (cmo *)mathcap_sysinfo_get_all(), (cmo *)mathcap_sm_get_all(), (cmo *)l3, NULL); - return new_cmo_mathcap((cmo *)mc); + char *host = getenv("HOSTTYPE"); + sysinfo.hosttype = (host != NULL)? new_string(host): "UNKNOWN"; + sysinfo.sysname = new_string(sysname); + sysinfo.version_string = new_string(vstr); + sysinfo.version = ver; + if (cmos != NULL) { + sysinfo.cmo_tags = new_int_array(cmos); + } + if (sms != NULL) { + sysinfo.sm_cmds = new_int_array(sms); + } } -static void mathcap_cmo_update(cmo_list* types) +mathcap *new_mathcap() { - cell *el = list_first(types); - cmo_int32 *ob; - while(!list_endof(types, el)) { - ob = (cmo_int32 *)el->cmo; - if (ob->tag == CMO_INT32) { - mathcap_cmo_allow(ob->i); - } - el = list_next(el); - } + mathcap *new = MALLOC(sizeof(mathcap)); + new->cmotbl = new_table(sysinfo.cmo_tags); + new->smtbl = new_table(sysinfo.sm_cmds); + return new; } -/* cmo_mathcap が妥当な構造を持つかを調べる. (未実装) */ -int cmo_mathcap_isvalid(cmo_mathcap *mc) +/* generating a cmo_mathcap by a local database. */ +cmo_mathcap* mathcap_get(mathcap *this) { - return 1; + cmo_list *mc = new_cmo_list(); + cmo_list *l3 = new_cmo_list(); + list_append(l3, (cmo *)list_appendl(new_cmo_list(), + new_cmo_int32(OX_DATA), + table_get_all(this->cmotbl), NULL)); + list_appendl(mc, (cmo *)sysinfo_get(), + (cmo *)table_get_all(this->smtbl), (cmo *)l3, NULL); + return new_cmo_mathcap((cmo *)mc); } /* ( ..., ( type, (...) ), (cmo_int32, (...) ), ... ) */ @@ -271,29 +305,28 @@ static cmo_list *get_messagetypes(cmo_list *ob, int ty /* cmo_mathcap->ob = ( (...), (...), ( ( cmo_int32, (...) ), ...), ...) */ /* ^^^^^ Here! */ +__inline__ static cmo_list *cmo_mathcap_get_cmotypes(cmo_mathcap *mc) { cmo_list *ob = (cmo_list *)list_nth((cmo_list *)mc->ob, 2); return get_messagetypes(ob, OX_DATA); } -/* 受信した mathcap データを反映させる */ -void mathcap_update(cmo_mathcap *mc) +/* The mathcap_update integrates received cmo_mathcap into the mathcap + database. If this == NULL, then an instance of mathcap is generated. */ +mathcap *mathcap_update(mathcap *this, cmo_mathcap *mc) { cmo_list *types; - if (cmo_mathcap_isvalid(mc)) { - types = cmo_mathcap_get_cmotypes(mc); - if (types != NULL) { - mathcap_cmo_deny_all(); /* すべての cmo の送信を禁止 */ - mathcap_cmo_update(types); - } + types = cmo_mathcap_get_cmotypes(mc); + if (types != NULL) { + table_ctl_all(this->cmotbl, MATHCAP_FLAG_DENY); + table_update(this->cmotbl, types); } + + return this; } -/* 互換性のため */ -cmo* make_mathcap_object(int version, char *id_string) +int mathcap_allowQ_cmo(mathcap *this, cmo *ob) { - mathcap_sysinfo_set(version, id_string, "ox_math"); - return (cmo *)mathcap_get(); + return table_allowQ_cmo(this->cmotbl, ob); } -