=================================================================== RCS file: /home/cvs/OpenXM/src/k097/ox_k0.c,v retrieving revision 1.4 retrieving revision 1.13 diff -u -p -r1.4 -r1.13 --- OpenXM/src/k097/ox_k0.c 2003/11/19 00:11:02 1.4 +++ OpenXM/src/k097/ox_k0.c 2021/03/12 06:45:55 1.13 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.3 2003/11/18 11:08:27 takayama Exp $ */ +/* $OpenXM: OpenXM/src/k097/ox_k0.c,v 1.12 2020/10/07 23:53:25 takayama Exp $ */ #include #include #include @@ -7,10 +7,15 @@ #include #include #include +#include +#include /* -lnsl -lsocket /usr/ucblib/libucb.a */ #include "../kxx/ox_kan.h" #include "../kxx/serversm.h" +#include "ox_k0.h" +#include "ki.h" + int OxCritical = 0; int OxInterruptFlag = 0; int PacketMonitor = 0; @@ -18,6 +23,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; @@ -28,7 +34,7 @@ jmp_buf EnvOfChildServer; int JmpMessage = 0; static char *getSuffix(char *s); -main(int argc, char *argv[]) { +int main(int argc, char *argv[]) { char *s; if (argc > 1) { @@ -44,6 +50,7 @@ main(int argc, char *argv[]) { K0_start(); nullserver(3,4); + return 0; } static char *getSuffix(char *s) { @@ -62,12 +69,13 @@ static char *getSuffix(char *s) { } return(s); } -nullserver(int fdStreamIn,int fdStreamOut) { +void nullserver(int fdStreamIn,int fdStreamOut) { int mtag; int message = 1; ox_stream ostreamIn; ox_stream ostreamOut; char sreason[1024]; + extern int RestrictedMode, RestrictedMode_saved; extern void controlResetHandler(); #if defined(__CYGWIN__) extern sigjmp_buf EnvOfStackMachine; @@ -75,6 +83,7 @@ nullserver(int fdStreamIn,int fdStreamOut) { extern jmp_buf EnvOfStackMachine; #endif int engineByteOrder; + extern int InSendmsg2; fflush(NULL); engineByteOrder = oxTellMyByteOrder(fdStreamOut,fdStreamIn); @@ -117,12 +126,18 @@ nullserver(int fdStreamIn,int fdStreamOut) { 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)) { @@ -150,12 +165,18 @@ nullserver(int fdStreamIn,int fdStreamOut) { */ 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); } } @@ -196,7 +217,7 @@ nullserver(int fdStreamIn,int fdStreamOut) { default: fprintf(stderr," ?! \n"); break; } } - /*sleep(2); /* for dubug OX_SYNC_BALL */ + /*sleep(2); // for dubug OX_SYNC_BALL */ switch(mtag) { case OX_COMMAND: nullserverCommand(ostreamIn,ostreamOut); @@ -215,7 +236,7 @@ nullserver(int fdStreamIn,int fdStreamOut) { } } -nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) { +int nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut) { int id; int mtag; int n; @@ -275,7 +296,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea 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); @@ -286,7 +307,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea 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); @@ -294,13 +315,13 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea } break; case SM_popCMO: - if (message) fprintf(stderr,"popCMO. Start to sending data.\n",n); + if (message) fprintf(stderr,"popCMO. Start to sending data %d\n",n); 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); + if (message) fprintf(stderr,"popString. send data from the stack %d\n",n); oxSendOXheader(ostreamOut,OX_DATA,SerialOX++); oxSendCmoString(ostreamOut,Sm1_popString()); if (message) fprintf(stderr,"Done.\n"); @@ -323,11 +344,11 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea } -nullserver_simplest(int fd) { +int nullserver_simplest(int fd) { int c; while(1) { c = readOneByte(fd); - if (c == '@') { return; } + if (c == '@') { return 0; } } } @@ -335,13 +356,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 @@ -365,7 +387,7 @@ extern int K00_verbose; int Startupk2 = 1; -K0_start() { +void K0_start() { extern int Saki; extern int Interactive; int i; @@ -427,7 +449,7 @@ K0_start() { KSstop(); closing */ -K0_executeStringByLocalParser() { +int K0_executeStringByLocalParser() { extern int Interactive; char *s; s = Sm1_popString();