===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxserver00.c,v
retrieving revision 1.7
retrieving revision 1.13
diff -u -p -r1.7 -r1.13
--- OpenXM/src/kxx/oxserver00.c	2002/02/24 10:27:21	1.7
+++ OpenXM/src/kxx/oxserver00.c	2003/11/20 11:41:44	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.6 2001/12/21 02:32:11 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.12 2003/11/19 01:02:40 takayama Exp $ */
 /* nullserver01 */
 #include <stdio.h>
 #include <sys/types.h>
@@ -15,6 +15,7 @@
 int OxCritical = 0;
 int OxInterruptFlag = 0;
 int PacketMonitor = 0;
+int NoExecution = 0;
 
 extern int SerialOX;  /* Serial number of the packets sent. */
 extern int SerialCurrent;  /* Current Serial number of the recieved packet. */
@@ -27,6 +28,7 @@ jmp_buf EnvOfChildServer;
 #endif
 
 int JmpMessage = 0;
+extern int Lisplike;
 
 static char *getSuffix(char *s);
 main(int argc, char *argv[]) {
@@ -43,6 +45,12 @@ main(int argc, char *argv[]) {
     if (strcmp(argv[1],"-monitor")==0) {
       fprintf(stderr,"Taking the packet monitor.\n");
       PacketMonitor = 1;
+    }else if (strcmp(argv[1],"-lispLike")==0) {
+      fprintf(stderr,"Output lispLike expression.\n");
+      Lisplike = 1;
+    }else if (strcmp(argv[1],"-noexec")==0) {
+      fprintf(stderr,"I do not execute commands.\n");
+      NoExecution = 1;
     }else{
       fprintf(stderr,"Unknown option. Possible options are -monitor\n");
     }
@@ -63,7 +71,7 @@ main(int argc, char *argv[]) {
     Sm1_start(0, NULL, "ox_sm1");
   }
 
-  nullserver(3);
+  nullserver(3,4);
 }
 
 static char *getSuffix(char *s) {
@@ -82,10 +90,11 @@ 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 void controlResetHandler();
 #if defined(__CYGWIN__)
@@ -95,19 +104,31 @@ nullserver(int fdStream) {
 #endif
   int engineByteOrder;
 
+  /* for debug,  use -monitor
+	 PacketMonitor = 1;  */
+
   fflush(NULL);
-  engineByteOrder = oxTellMyByteOrder(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 : ;
 #if defined(__CYGWIN__)
   if (sigsetjmp(EnvOfChildServer,1)) {
@@ -118,6 +139,8 @@ nullserver(int fdStream) {
     if (OxInterruptFlag == 0) {
       fprintf(stderr," ?! \n"); fflush(NULL);
     }
+	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+	KSexecuteString(" (Computation is interrupted.) ");
     signal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
     if (JmpMessage) fprintf(stderr,"Set EnvOfChildServer.\n");
@@ -128,7 +151,7 @@ nullserver(int fdStream) {
 #else  
   if (setjmp(EnvOfStackMachine)) {
 #endif
-    fprintf(stderr,"childServerMain: jump here by EnvOfStackMachine.\n");
+    fprintf(stderr,"childServerMain: jump here by EnvOfStackMachine or timeout.\n");
     if (OxInterruptFlag == 0) {
       fprintf(stderr," ?! \n"); fflush(NULL);
     }
@@ -142,6 +165,7 @@ nullserver(int fdStream) {
     */
     Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");
 
+	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
     signal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
@@ -151,22 +175,22 @@ nullserver(int fdStream) {
   }
   
   while (1) {
-    message = OXprintMessage;
+    message = OXprintMessage;  
     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 +199,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) {
@@ -183,18 +207,18 @@ nullserver(int fdStream) {
       case OX_DATA:    fprintf(stderr," OX_DATA \n"); break;
       case OX_SYNC_BALL: fprintf(stderr," OX_SYNC_BALL \n"); break;
       case -1: fprintf(stderr," End of file. Exiting the server child.\n");
-        exit(); break;
+        exit(0); break;
       default: fprintf(stderr," ?! \n"); break;
       }
     }
     /*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 +230,7 @@ nullserver(int fdStream) {
   }
 }
 
-nullserverCommand(ox_stream ostream) {
+nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) {
   int id;
   int mtag;
   int n;
@@ -218,54 +242,49 @@ nullserverCommand(ox_stream ostream) {
   char *emsg;
   extern void controlResetHandler();
 
-  message = OXprintMessage;
+  message = OXprintMessage;  
   /* message_body */
-  id = oxGetInt32(ostream);   /* get the function_id */
-  if (message) {fprintf(stderr,"\nfunction_id is %d\n",id);}
+  id = oxGetInt32(ostreamIn);   /* get the function_id */
+  if (message) {fprintf(stderr,"\nfunction_id is %d; %s\n",id,oxFIDtoStr(id));}
   switch( id ) {
   case SM_mathcap:
-    if (message) fprintf(stderr," mathcap\n");
     mathresult = (struct mathCap *)Sm1_mathcap();
     oxPushMathCap(mathresult);
     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");
     Sm1_pops();
     break;
   case SM_getsp:
-    if (message) fprintf(stderr," getsp \n");
     Sm1_getsp();
     break;
   case SM_dupErrors:
-    if (message) fprintf(stderr," dupErrors \n");
     Sm1_dupErrors();
     break;
   case SM_pushCMOtag:
-    if (message) fprintf(stderr," pushCMOtag \n");
     Sm1_pushCMOtag(SerialCurrent);
     break;
   case SM_setName:
-    if (message) fprintf(stderr," setName \n");
     iresult = Sm1_setName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"setName");
     }
     break;
   case SM_evalName:
-    if (message) fprintf(stderr," evalName \n");
     iresult = Sm1_evalName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"evalName");
     }
     break;
   case SM_executeStringByLocalParser:
-    if (message) fprintf(stderr," executeStringByLocalParser\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeString: ");
@@ -274,9 +293,12 @@ nullserverCommand(ox_stream ostream) {
     }
     break;
   case SM_executeFunction:
-    if (message) fprintf(stderr," executeFunction\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeFunction: ");
@@ -285,15 +307,13 @@ 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:
@@ -327,6 +347,7 @@ void controlResetHandler(sig)
      int sig;
 {
   signal(sig,SIG_IGN);
+  cancelAlarm();
   fprintf(stderr,"From controlResetHandler. OxCritical = %d\n",OxCritical);
   OxInterruptFlag = 1;
   if (OxCritical) {