=================================================================== RCS file: /home/cvs/OpenXM/src/ox_math/math2ox.c,v retrieving revision 1.8 retrieving revision 1.22 diff -u -p -r1.8 -r1.22 --- OpenXM/src/ox_math/math2ox.c 1999/11/29 12:09:57 1.8 +++ OpenXM/src/ox_math/math2ox.c 2003/02/04 14:22:04 1.22 @@ -1,6 +1,15 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.7 1999/11/19 20:51:36 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_math/math2ox.c,v 1.21 2003/01/13 12:04:53 ohara Exp $ */ +/* + Copyright (C) Katsuyoshi OHARA, 2000. + Portions copyright 1999 Wolfram Research, Inc. + + You must see OpenXM/Copyright/Copyright.generic. + The MathLink Library is licensed from Wolfram Research Inc.. + See OpenXM/Copyright/Copyright.mathlink for detail. +*/ + #include #include #include @@ -11,81 +20,86 @@ #include #include #include +#include -#include "ox.h" -#include "parse.h" -#include "serv2.h" - static char *host = "localhost"; static char *ctlserv = "ox"; static char *oxprog = "ox_sm1"; -ox_file_t sv; +static OXFILE **ss = NULL; +static int len_ss = 0; +static int max_process = 0; -/* Mathematica から直接呼び出される関数の定義. */ -/* 呼び出しの方法は math2ox.tm で定義される. */ -void OX_receive() +/* The following functions are called from Mathematica. + See math2.tm for detail. */ +void OX_get(int id) { cmo *c = NULL; - receive_ox_tag(sv->stream); - c = receive_cmo(sv->stream); -#ifdef DEBUG - fprintf(stderr, "received ox in OxReceive[].\n"); + receive_ox_tag(ss[id]); + c = receive_cmo(ss[id]); + ox_printf("ox message is received in OxGet[].\n"); print_cmo(c); - fflush(stderr); -#endif - ml_sendObject(c); + send_mlo(c); + ml_flush(); } -int OX_executeStringByLocalParser(const char *str) +int OX_execute_string(int id, const char *str) { - ox_executeStringByLocalParser(sv, str); + ox_execute_string(ss[id], str); return 0; } -char *OX_popString() +char *OX_popString(int id) { - return ox_popString(sv, sv->stream); + return ox_popString(ss[id]); } -void OX_popCMO() +void OX_popCMO(int id) { - cmo *c = ox_pop_cmo(sv, sv->stream); - ml_sendObject(c); + cmo *c = ox_pop_cmo(ss[id]); + send_mlo(c); + ml_flush(); } -int OX_close() +int OX_close(int id) { - ox_close(sv); + ox_close(ss[id]); return 0; } -int OX_reset() +int OX_reset(int id) { - ox_reset(sv); + ox_reset(ss[id]); return 0; } -/* 文字列 s を parse() にかけて生成された cmo を サーバに送る. */ -int OX_parse(char *s) +/* This function is compatible with previous version of math2ox. */ +/* Parsing s and sending its cmo to an OX server. */ +int OX_parse(int id, char *s) { + return OX_sendMessage(id, s); +} + +/* After creating an OX message by parsing a string s, + the function send the message to the OX server id. */ +int OX_sendMessage(int id, char *s) +{ cmo *m; - symbol *symp; int len = strlen(s); - setmode_mygetc(s, len); + init_parser(s); if(s != NULL && len > 0 && (m = parse()) != NULL) { if (m->tag == OX_DATA) { - send_ox_cmo(sv->stream, ((ox_data *)m)->cmo); + send_ox_cmo(ss[id], ((ox_data *)m)->cmo); }else if (m->tag == OX_COMMAND) { - send_ox_command(sv->stream, ((ox_command *)m)->command); + send_ox_command(ss[id], ((ox_command *)m)->command); }else { - send_ox_cmo(sv->stream, m); + send_ox_cmo(ss[id], m); } return 0; } - return -1; /* 失敗した場合 */ + return -1; /* if we failed. */ } int OX_start(char* s) @@ -93,11 +107,30 @@ int OX_start(char* s) if (s != NULL && s[0] != '\0') { oxprog = s; } - sv = ox_start(host, ctlserv, oxprog); - fprintf(stderr, "open (%s)\n", "localhost"); - return 0; + if (++max_process < len_ss) { + ss[max_process] = ox_start(host, ctlserv, oxprog); + ox_printf("open (%s)\n", "localhost"); + return max_process; + } + return -1; } +int OX_start_remote_ssh(char *s, char *host) +{ + if (s != NULL && s[0] != '\0') { + oxprog = s; + } + if (host != NULL || host[0] == '\0') { + host = "localhost"; + } + if (++max_process < len_ss) { + ss[max_process] = ox_start_remote_with_ssh(oxprog, host); + ox_printf("open (%s)\n", host); + return max_process; + } + return -1; +} + int OX_start_insecure(char *host, int portCtl, int portDat) { if (host != NULL || host[0] == '\0') { @@ -110,10 +143,13 @@ int OX_start_insecure(char *host, int portCtl, int por portDat = 1300; } - sv = ox_start_insecure_nonreverse(host, portCtl, portDat); - fprintf(stderr, "math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); + if (++max_process < len_ss) { + ss[max_process] = ox_start_insecure(host, portCtl, portDat); + ox_printf("math2ox :: connect to \"%s\" with (ctl, dat) = (%d, %d)\n", host, portCtl, portDat); + return max_process; + } - return 0; + return -1; } static char *cp_str(char *src) @@ -131,11 +167,34 @@ int OX_setClientParam(char *h, char* c, char* p) return 0; } +static OXFILE **new_sstack(int size) +{ + max_process = 0; + len_ss = size; + return (OXFILE **)malloc(sizeof(OXFILE *)*len_ss); +} + +static OXFILE *ss_id(int id) +{ + return ss[id]; +} + +static int ss_id_stream(int id) +{ + return ss[id]; +} + +#define VERSION 0x11121400 +#define ID_STRING "2000/11/29" + int main(int argc, char *argv[]) { - /* 構文解析器の設定 */ + ox_stderr_init(NULL); + + /* setting the OX parser */ setflag_parse(PFLAG_ADDREV); - setgetc(mygetc); + ss = new_sstack(20); + mathcap_init(VERSION, ID_STRING, "math2ox", NULL, NULL); MLMain(argc, argv); }