===================================================================
RCS file: /home/cvs/OpenXM/src/k097/ox_k0.c,v
retrieving revision 1.3
retrieving revision 1.11
diff -u -p -r1.3 -r1.11
--- OpenXM/src/k097/ox_k0.c	2003/11/18 11:08:27	1.3
+++ OpenXM/src/k097/ox_k0.c	2016/03/31 05:27:34	1.11
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.2 2003/08/22 16:08:20 ohara Exp $ */
+/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.10 2015/10/10 11:29:46 takayama Exp $ */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -7,6 +7,8 @@
 #include <netdb.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <string.h>
+#include <stdlib.h>
 /* -lnsl -lsocket /usr/ucblib/libucb.a */
 #include "../kxx/ox_kan.h"
 #include "../kxx/serversm.h"
@@ -18,6 +20,7 @@ int PacketMonitor = 0;
 extern int SerialOX;  /* Serial number of the packets sent. */
 extern int SerialCurrent;  /* Current Serial number of the recieved packet. */
 extern int OXprintMessage; /* print oxmessages? */
+extern int Calling_ctrlC_hook;
 
 #if defined(__CYGWIN__)
 sigjmp_buf EnvOfChildServer;
@@ -43,7 +46,7 @@ main(int argc, char *argv[]) {
   /* Sm1_start(0, NULL, "ox_sm1");  */
   K0_start();
 
-  nullserver(3);
+  nullserver(3,4);
 }
 
 static char *getSuffix(char *s) {
@@ -62,11 +65,13 @@ static char *getSuffix(char *s) {
   }
   return(s);
 }
-nullserver(int fdStream) {
+nullserver(int fdStreamIn,int fdStreamOut) {
   int mtag;
   int message = 1;
-  ox_stream ostream;
+  ox_stream ostreamIn;
+  ox_stream ostreamOut;
   char sreason[1024];
+  extern int RestrictedMode, RestrictedMode_saved;
   extern void controlResetHandler();
 #if defined(__CYGWIN__)
   extern sigjmp_buf EnvOfStackMachine;
@@ -74,20 +79,29 @@ nullserver(int fdStream) {
   extern jmp_buf EnvOfStackMachine;
 #endif
   int engineByteOrder;
+  extern int InSendmsg2;
 
   fflush(NULL);
-  engineByteOrder = oxTellMyByteOrder(fdStream,fdStream);
+  engineByteOrder = oxTellMyByteOrder(fdStreamOut,fdStreamIn);
   /* Set the network byte order. */
   fprintf(stderr,"engineByteOrder=%x\n",engineByteOrder);
   
-  if (fdStream != -1) {
-    ostream = fp2open(fdStream);
-    if (ostream == NULL) {
-      fprintf(stderr,"fp2open(fdStream) failed.\n");
-      fdStream = -1;
+  if (fdStreamIn != -1) {
+    ostreamIn = fp2open(fdStreamIn);
+    if (ostreamIn == NULL) {
+      fprintf(stderr,"fp2open(fdStreamIn) failed.\n");
+      fdStreamIn = -1;
     }
-    if (PacketMonitor) fp2watch(ostream,stdout);
+    if (PacketMonitor) fp2watch(ostreamIn,stdout);
   }
+  if (fdStreamOut != -1) {
+    ostreamOut = fp2open(fdStreamOut);
+    if (ostreamOut == NULL) {
+      fprintf(stderr,"fp2open(fdStreamOut) failed.\n");
+      fdStreamOut = -1;
+    }
+    if (PacketMonitor) fp2watch(ostreamOut,stdout);
+  }
   aaa : ;
   clearInop(); 
 #if defined(__CYGWIN__)
@@ -108,12 +122,18 @@ nullserver(int fdStream) {
     if (OxInterruptFlag == 0) {
       fprintf(stderr," ?! \n"); fflush(NULL);
     }
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1; RestrictedMode = 0;
+      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      RestrictedMode = RestrictedMode_saved;
+    }
+    Calling_ctrlC_hook = 0;
 	KSexecuteString(" (Computation is interrupted.) ");
-    signal(SIGUSR1,controlResetHandler); goto aaa;
+	InSendmsg2 = 0;
+    mysignal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
     if (JmpMessage) fprintf(stderr,"Set EnvOfChildServer.\n");
-    signal(SIGUSR1,controlResetHandler);
+    mysignal(SIGUSR1,controlResetHandler);
   }
 #if defined(__CYGWIN__)
   if (sigsetjmp(EnvOfStackMachine,1)) {
@@ -141,12 +161,18 @@ nullserver(int fdStream) {
     */
     Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");
 
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
-    signal(SIGUSR1,controlResetHandler); goto aaa ;
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1; RestrictedMode = 0;
+	  KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      RestrictedMode = RestrictedMode_saved;
+    }
+    Calling_ctrlC_hook = 0;
+    InSendmsg2=0;
+    mysignal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
-    if (signal(SIGUSR1,SIG_IGN) != SIG_IGN) {
-      signal(SIGUSR1,controlResetHandler);
+    if (mysignal(SIGUSR1,SIG_IGN) != SIG_IGN) {
+      mysignal(SIGUSR1,controlResetHandler);
     }
   }
   
@@ -155,18 +181,18 @@ nullserver(int fdStream) {
     if (OxInterruptFlag) {
       OxCritical = 1;
       if (message) {fprintf(stderr,"Clearing the read buffer.\n");fflush(NULL); }
-      fp2clearReadBuf(ostream); /* clear the read buffer */
+      fp2clearReadBuf(ostreamIn); /* clear the read buffer */
       if (message) {fprintf(stderr,"Throwing OX_SYNC_BALL\n"); fflush(NULL);}
-      oxSendSyncBall(ostream);
+      oxSendSyncBall(ostreamOut);
       if (message) {fprintf(stderr,"Waiting for OX_SYNC_BALL\n");fflush(NULL);}
-      oxWaitSyncBall(ostream);
+      oxWaitSyncBall(ostreamIn);
       if (message) {fprintf(stderr,"Done changing OX_SYNC_BALL\n"); fflush(NULL);}
       OxInterruptFlag = 0;
       OxCritical = 0;
       goto aaa ;
     }
     OxCritical = 0;
-    if (fp2select(ostream,-1)) {
+    if (fp2select(ostreamIn,-1)) {
       /* If there is an data in the ostream, then read data in the buffer and
          read data in the communication stream. */
       OxCritical = 1;
@@ -175,7 +201,7 @@ nullserver(int fdStream) {
       /* This part is never reached. */
     }
     OxCritical = 1;
-    mtag = oxGetOXheader(ostream,&SerialCurrent); /* get the message_tag */
+    mtag = oxGetOXheader(ostreamIn,&SerialCurrent); /* get the message_tag */
     if (message) {
       fprintf(stderr,"\nmtag is %d (serial=%d) : ",mtag,SerialCurrent);
       switch(mtag) {
@@ -190,11 +216,11 @@ nullserver(int fdStream) {
     /*sleep(2);  /* for dubug OX_SYNC_BALL */
     switch(mtag) {
     case OX_COMMAND:
-      nullserverCommand(ostream);
+      nullserverCommand(ostreamIn,ostreamOut);
       goto aaa ;  /* We always reset the jump vector. cf. memo1.txt 1998 2/13*/
       break;
     case OX_DATA:
-      Sm1_pushCMO(ostream);
+      Sm1_pushCMO(ostreamIn);
       break;
     case OX_SYNC_BALL:
       /* if (OxInterruptFlag)  think about it later. */
@@ -206,7 +232,7 @@ nullserver(int fdStream) {
   }
 }
 
-nullserverCommand(ox_stream ostream) {
+nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) {
   int id;
   int mtag;
   int n;
@@ -220,7 +246,7 @@ nullserverCommand(ox_stream ostream) {
 
   message = OXprintMessage;
   /* message_body */
-  id = oxGetInt32(ostream);   /* get the function_id */
+  id = oxGetInt32(ostreamIn);   /* get the function_id */
   if (message) {fprintf(stderr,"\nfunction_id is %d\n",id);}
   switch( id ) {
   case SM_mathcap:
@@ -230,7 +256,7 @@ nullserverCommand(ox_stream ostream) {
     break;
   case SM_setMathCap:
     if (message) fprintf(stderr," setMathCap\n");
-    Sm1_setMathCap(ostream);
+    Sm1_setMathCap(ostreamOut);
     break;
   case SM_pops:
     if (message) fprintf(stderr," pops \n");
@@ -266,7 +292,7 @@ nullserverCommand(ox_stream ostream) {
     if (message) fprintf(stderr," executeStringByLocalParser\n");
     OxCritical = 0;
     iresult = K0_executeStringByLocalParser();
-    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    OxCritical = 1; mysignal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeString: ");
       Sm1_pushError2(SerialCurrent,-1,emsg);
@@ -277,7 +303,7 @@ nullserverCommand(ox_stream ostream) {
     if (message) fprintf(stderr," executeFunction\n");
     OxCritical = 0;
     iresult = K0_executeStringByLocalParser();
-    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    OxCritical = 1; mysignal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeFunction: ");
       Sm1_pushError2(SerialCurrent,-1,emsg);
@@ -286,14 +312,14 @@ nullserverCommand(ox_stream ostream) {
     break;
   case SM_popCMO:
     if (message) fprintf(stderr,"popCMO.  Start to sending data.\n",n);
-    oxSendOXheader(ostream,OX_DATA,SerialOX++);
-    n=Sm1_popCMO(ostream,SerialCurrent);
+    oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
+    n=Sm1_popCMO(ostreamOut,SerialCurrent);
     if (message) fprintf(stderr,"Done.\n"); 
     break;
   case SM_popString:
     if (message) fprintf(stderr,"popString. send data from the stack.\n",n);
-    oxSendOXheader(ostream,OX_DATA,SerialOX++);
-    oxSendCmoString(ostream,Sm1_popString());
+    oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
+    oxSendCmoString(ostreamOut,Sm1_popString());
     if (message) fprintf(stderr,"Done.\n");
     break;
   case SM_shutdown:
@@ -318,7 +344,7 @@ nullserver_simplest(int fd) {
   int c;
   while(1) {
     c = readOneByte(fd);
-    if (c == '@') { return; }
+    if (c == '@') { return 0; }
   }
 }
 
@@ -326,13 +352,14 @@ nullserver_simplest(int fd) {
 void controlResetHandler(sig)
      int sig;
 {
-  signal(sig,SIG_IGN);
+  mysignal(sig,SIG_IGN);
   cancelAlarm();
   fprintf(stderr,"From controlResetHandler. OxCritical = %d\n",OxCritical);
   OxInterruptFlag = 1;
   if (OxCritical) {
     return;
   }else{
+    (void) traceShowStack(); traceClearStack();
 #if defined(__CYGWIN__)
     siglongjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */
 #else