===================================================================
RCS file: /home/cvs/OpenXM/src/ox_math/serv1.c,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- OpenXM/src/ox_math/serv1.c	2000/12/07 10:04:56	1.15
+++ OpenXM/src/ox_math/serv1.c	2003/01/13 12:04:53	1.20
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_math/serv1.c,v 1.14 2000/12/03 22:09:34 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_math/serv1.c,v 1.19 2003/01/11 12:38:57 ohara Exp $ */
 
 /* 
    Copyright (C) Katsuyoshi OHARA, 2000.
@@ -20,15 +20,16 @@
 
 extern OXFILE *stack_oxfp;
 
-/* if in_critical equals to 1 then we do not permit an interrupt. */
-static int flag_sigusr1 = 0;
-
 /* SM_control_reset_connection */
 static void handler()
 {
-    fprintf(stderr, "signal received.\n");
-    signal(SIGUSR1, handler);
-    flag_sigusr1++;
+	sigset_t newmask, oldmask;
+	sigemptyset(&newmask);
+	sigaddset(&newmask, SIGUSR1);
+	sigprocmask(SIG_SETMASK, &newmask, &oldmask);
+    ox_printf("signal received.\n");
+    exchange_ox_sync_ball(stack_oxfp);
+	sigprocmask(SIG_SETMASK, &oldmask, NULL); /* unmasked. */
 }
 
 static int exchange_ox_sync_ball(OXFILE *oxfp)
@@ -58,11 +59,10 @@ int main()
 {
     OXFILE* sv;
 
+    ox_stderr_init(NULL);
     ml_init();
     mathcap_init(VERSION, ID_STRING, "ox_math", NULL, NULL);
 
-    signal(SIGUSR1, handler);
-
     sv = oxf_open(3);
     oxf_determine_byteorder_server(sv);
     sm(sv);
@@ -88,7 +88,7 @@ int sm_receive_ox()
         sm_run(code);
         break;
     default:
-        fprintf(stderr, "illeagal message? ox_tag = (%d)\n", tag);
+        ox_printf("illeagal message? ox_tag = (%d)\n", tag);
         break;
     }
     return 1;
@@ -96,19 +96,23 @@ int sm_receive_ox()
 
 int sm(OXFILE *oxfp)
 {
-	int mask;
+    fd_set fdmask;
     stack_oxfp = oxfp;
     stack_extend();
+    signal(SIGUSR1, handler);
 
-    mask = sigsetmask(sigmask(SIGUSR1));
-    while(sm_receive_ox()) {
-        sigsetmask(mask);
-        usleep(1);
-        sigsetmask(sigmask(SIGUSR1));
-        if(flag_sigusr1) {
-            exchange_ox_sync_ball(oxfp);
-            flag_sigusr1 = 0;
+    FD_ZERO(&fdmask);
+    FD_SET(oxf_fileno(oxfp), &fdmask);
+
+    while(1) {
+        if (select(5, &fdmask, NULL, NULL, NULL) > 0) {
+			sigset_t newmask, oldmask;
+			sigemptyset(&newmask);
+			sigaddset(&newmask, SIGUSR1);
+			sigprocmask(SIG_SETMASK, &newmask, &oldmask);
+            sm_receive_ox();
+			sigprocmask(SIG_SETMASK, &oldmask, NULL); /* unmasked. */
         }
     }
-    fprintf(stderr, "SM: socket(%d) is closed.\n", stack_oxfp->fd);
+    ox_printf("SM: socket(%d) is closed.\n", stack_oxfp->fd);
 }