===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/serv1.c,v
retrieving revision 1.5
retrieving revision 1.13
diff -u -p -r1.5 -r1.13
--- OpenXM/src/ox_math/serv1.c	1999/11/18 22:07:50	1.5
+++ OpenXM/src/ox_math/serv1.c	2000/12/03 21:46:52	1.13
@@ -1,25 +1,31 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/serv1.c,v 1.4 1999/11/18 21:56:43 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/serv1.c,v 1.12 2000/12/03 15:19:23 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
-#include <gmp.h>
 #include <mathlink.h>
-#include "ox.h"
-#include "serv2.h"
+#include <ox_toolkit.h>
+#include "sm.h"
 
-static int send_ox_sync_ball(int fd);
+static int send_ox_sync_ball();
 
-extern MLINK lp;
-static int sv_read  = 3;
-static int sv_write = 4;
+extern OXFILE *stack_oxfp;
 
 static int flag_sigusr1 = 0;
 static int flag_sigusr2 = 0;
 
-/* 1 のとき割り込み禁止 */
+/* if in_critical equals to 1 then we do not permit an interrupt. */
 static int in_critical = 0; 
 
 static int set_critical()
@@ -46,7 +52,7 @@ static int handler_reset1()
     if (!flag_sigusr1) {
         flag_sigusr1 = 1;
         if(critical_p()) {
-            send_ox_sync_ball(sv_write);
+            send_ox_sync_ball();
             already_send_ox_sync_ball = 1;
         }
     }
@@ -54,87 +60,108 @@ static int handler_reset1()
 
 static int handler_kill()
 {
-    close(3);
-    close(4);
+    oxf_close(stack_oxfp);
     exit(1);
 }
 
-static int send_ox_sync_ball(int fd)
+static int send_ox_sync_ball()
 {
     fprintf(stderr, "sending a sync_ball.\n");
-    send_ox_tag(fd, OX_SYNC_BALL);
+    send_ox_tag(stack_oxfp, OX_SYNC_BALL);
 }
 
-static int exchange_ox_syncball(int fd)
+static int exchange_ox_syncball()
 {
     int tag;
 
-    while((tag = receive_ox_tag(fd)) != OX_SYNC_BALL) {
+    while((tag = receive_ox_tag(stack_oxfp)) != OX_SYNC_BALL) {
         /* skipping a message. */
         if (tag == OX_DATA) {
-            receive_cmo(fd);
+            receive_cmo(stack_oxfp);
         }else {
-            receive_int32(fd);
+            receive_int32(stack_oxfp);
         }
     }
     fprintf(stderr, "received a sync_ball.\n");
 }
 
-/* スタックマシン部分 */
-int receive_ox(int fd_read, int fd_write)
+/* a part of stack machine. */
+int sm_receive_ox()
 {
     int tag;
     int code;
 
-    tag = receive_ox_tag(fd_read);
+    tag = receive_ox_tag(stack_oxfp);
+    if (oxf_error(stack_oxfp)) {
+        return 0;
+    }
     switch(tag) {
     case OX_DATA:
-        push(receive_cmo(fd_read));
+        push(receive_cmo(stack_oxfp));
         break;
     case OX_COMMAND:
-        code = receive_sm_command(fd_read);
+        code = receive_sm_command(stack_oxfp);
         set_critical();
-        execute_sm_command(fd_write, code);
+        sm_run(code);
         unset_critical();
         break;
     default:
         fprintf(stderr, "illeagal message? ox_tag = (%d)\n", tag);
-        return -1;
+        return 0;
         break;
     }
-    return 0;
+    return 1;
 }
 
 int shutdown()
 {
-	close(sv_read);
-	close(sv_write);
-	MATH_exit();
-	exit(0);
+    oxf_close(stack_oxfp);
+    ml_exit();
+    exit(0);
 }
 
+#define VERSION 0x11121400
+#define ID_STRING  "2000/11/29"
+
+int oxf_error(OXFILE *oxfp)
+{
+    int e = oxfp->error;
+    if (e != 0) {
+        oxfp->error = 0;
+    }
+    return e;
+}
+
 int main()
 {
-    MATH_init();
-    initialize_stack();
+    OXFILE* sv;
 
+    ml_init();
+    mathcap_init(VERSION, ID_STRING, "ox_math", NULL, NULL);
+
     signal(SIGUSR1, handler_reset1);
     signal(SIGKILL, handler_kill);
 
-    /* バイトオーダの決定 */
-    decideByteOrderServer(sv_read, 0);
+    sv = oxf_open(3);
+    oxf_determine_byteorder_server(sv);
+    sm(sv);
+    shutdown();
+}
 
-    while(1) {
-        receive_ox(sv_read, sv_write);
+int sm(OXFILE *oxfp)
+{
+    stack_oxfp = oxfp;
+    stack_extend();
+    while(sm_receive_ox()) {
         if(flag_sigusr1) {
             if (!already_send_ox_sync_ball) {
-              send_ox_sync_ball(sv_write);
+              send_ox_sync_ball();
                 already_send_ox_sync_ball = 1;
             }
-            exchange_ox_syncball(sv_read);
+            exchange_ox_syncball();
             flag_sigusr1 = 0;
             already_send_ox_sync_ball = 0;
         }
     }
-    shutdown();
+    fprintf(stderr, "SM: socket(%d) is closed.\n", stack_oxfp->fd);
 }