===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/sm_ext.c,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/ox_math/sm_ext.c	2003/01/11 12:38:57	1.3
+++ OpenXM/src/ox_math/sm_ext.c	2003/02/12 08:28:41	1.8
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/sm_ext.c,v 1.2 2000/12/03 22:09:34 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/sm_ext.c,v 1.7 2003/02/04 14:27:43 ohara Exp $ */
 
 /* 
    Copyright (C) Katsuyoshi OHARA, 2000.
@@ -13,10 +13,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <gmp.h>
-#include <mathlink.h>
+#include <signal.h>
 #include <ox_toolkit.h>
 #include "sm.h"
+#include "mlo.h"
 
 static struct { int (*func_ptr)(); int key; } tbl_smcmd[] = {
     {sm_executeFunction, SM_executeFunction}, 
@@ -33,6 +33,49 @@ static struct { int (*func_ptr)(); int key; } tbl_smcm
 
 extern OXFILE *stack_oxfp;
 
+static sigset_t mask;
+static int flag_state_interrupting = 0;
+
+/* state management for the OpenXM robust interruption */
+void sm_state_set_interrupting()
+{
+    ml_state_set(RESERVE_INTERRUPTION);
+}
+
+int sm_state_interrupting()
+{
+    return ml_state(RESERVE_INTERRUPTION);
+}
+
+void sm_state_clear_interrupting()
+{
+    ml_state_clear_all();
+}
+
+/* handling OpenXM singals */
+static void sm_sighandler()
+{
+    sm_state_set_interrupting();
+}
+
+/* generating the mask pattern */
+void sm_siginit()
+{
+    signal(SIGUSR1, sm_sighandler);
+    sigemptyset(&mask);
+    sigaddset(&mask, SIGUSR1);
+}
+
+void sm_sigmask()
+{
+    sigprocmask(SIG_BLOCK, &mask, NULL);
+}
+
+void sm_sigunmask()
+{
+    sigprocmask(SIG_UNBLOCK, &mask, NULL);
+}
+
 int (*sm_search_f(int code))()
 {
     int i;
@@ -49,13 +92,7 @@ void sm_popString()
 {
     char *s;
     cmo *err;
-    cmo *m;
-
-#ifdef DEBUG
-    fprintf(ox_stderr, "ox_math:: opecode = SM_popString.\n");
-#endif
-
-    m = pop();
+    cmo *m = pop();
     if (m->tag == CMO_STRING) {
         send_ox_cmo(stack_oxfp, m);
     }else if ((s = new_string_set_cmo(m)) != NULL) {
@@ -87,13 +124,8 @@ int local_execute(char *s)
 /* The following function is depend on an implementation of a server. */
 void sm_executeStringByLocalParser()
 {
-    symbol_t symp;
     cmo* m = pop();
     char *s = NULL;
-#ifdef DEBUG
-    fprintf(ox_stderr, "ox_math:: opecode = SM_executeStringByLocalParser.\n");
-#endif
-
     if (m->tag == CMO_STRING
         && strlen(s = ((cmo_string *)m)->s) != 0) {
         if (s[0] == ':') {
@@ -102,14 +134,14 @@ void sm_executeStringByLocalParser()
             /* for mathematica */
             /* Sending the string `s' to mathematica for its evaluation. */
             ml_evaluateStringByLocalParser(s);
+            sm_sigunmask();
             ml_select();
-            push(receive_mlo());
+            sm_sigmask();
+            m = ml_return();
+            push(m);
         }
     }else {
-#ifdef DEBUG
-		symp = lookup_by_tag(m->tag);
-		fprintf(ox_stderr, "ox_math:: error. the top of stack is %s.\n", symbol_get_key(symp));
-#endif
+		ox_printf(" <%s>", get_symbol_by_tag(m->tag));
 		push_error(SM_executeStringByLocalParser, m);
 	}
 }
@@ -136,8 +168,11 @@ void sm_executeFunction()
         argv[i] = pop();
     }
     ml_executeFunction(func, argc, argv);
+    sm_sigunmask();
     ml_select();
-    push(receive_mlo());
+    sm_sigmask();
+    m = ml_return();
+    push(m);
 }
 
 void sm_mathcap()
@@ -155,4 +190,3 @@ void sm_set_mathcap()
         /* an error object must be pushed */
     }
 }
-