=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/oxserver00.c,v retrieving revision 1.15 retrieving revision 1.25 diff -u -p -r1.15 -r1.25 --- OpenXM/src/kxx/oxserver00.c 2004/09/05 00:51:18 1.15 +++ OpenXM/src/kxx/oxserver00.c 2020/10/07 07:47:23 1.25 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.14 2004/03/08 08:24:42 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.24 2016/08/28 02:43:15 takayama Exp $ */ /* nullserver01 */ #include #include @@ -8,6 +8,7 @@ #include #include #include +#include /* -lnsl -lsocket /usr/ucblib/libucb.a */ #include "ox_kan.h" #include "serversm.h" @@ -21,18 +22,27 @@ extern int SerialOX; /* Serial number of the packets extern int SerialCurrent; /* Current Serial number of the recieved packet. */ extern int OXprintMessage; /* print oxmessages? */ extern int Calling_ctrlC_hook; +extern int RestrictedMode, RestrictedMode_saved; -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) || defined(__MSYS__) sigjmp_buf EnvOfChildServer; #else jmp_buf EnvOfChildServer; #endif +void nullserver(int fdStreamIn,int fdStreamOut); +int nullserverCommand(ox_stream ostreamIn,ox_stream ostreamOut); +int nullserver_simplest(int fd); +int KSexecuteString(char *s); // kan96xx/Kan/datatype.h +void cancelAlarm(); // nullstackmachine.c +char *traceShowStack(); // kan96xx/Kan/extern.h +void traceClearStack(); // kan96xx/Kan/extern.h + int JmpMessage = 0; extern int Lisplike; static char *getSuffix(char *s); -main(int argc, char *argv[]) { +void main(int argc, char *argv[]) { char *s; char *forAsir[] = {"callsm1.sm1","callsm1b.sm1"}; char *gnuplot[] = {"callsm1.sm1","gnuplot.sm1"}; @@ -91,14 +101,14 @@ 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 void controlResetHandler(); -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) || defined(__MSYS__) extern sigjmp_buf EnvOfStackMachine; #else extern jmp_buf EnvOfStackMachine; @@ -130,31 +140,35 @@ nullserver(int fdStreamIn,int fdStreamOut) { if (PacketMonitor) fp2watch(ostreamOut,stdout); } + /* fprintf(stderr,"Hello world.\n"); OXprintMessage = 1; + JmpMessage = 1; */ + aaa : ; #if defined(__CYGWIN__) - if (sigsetjmp(EnvOfChildServer,1)) { + if (MYSIGSETJMP(EnvOfChildServer,1)) { #else - if (setjmp(EnvOfChildServer)) { + if (MYSETJMP(EnvOfChildServer)) { #endif fprintf(stderr,"childServerMain: jump here.\n"); if (OxInterruptFlag == 0) { fprintf(stderr," ?! \n"); fflush(NULL); } if (!Calling_ctrlC_hook) { - Calling_ctrlC_hook = 1; + 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; + 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)) { + if (MYSIGSETJMP(EnvOfStackMachine,1)) { #else - if (setjmp(EnvOfStackMachine)) { + if (MYSETJMP(EnvOfStackMachine)) { #endif fprintf(stderr,"childServerMain: jump here by EnvOfStackMachine or timeout.\n"); if (OxInterruptFlag == 0) { @@ -171,15 +185,16 @@ nullserver(int fdStreamIn,int fdStreamOut) { Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error"); if (!Calling_ctrlC_hook) { - Calling_ctrlC_hook = 1; + Calling_ctrlC_hook = 1; RestrictedMode = 0; KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */ + RestrictedMode = RestrictedMode_saved; } Calling_ctrlC_hook = 0; - signal(SIGUSR1,controlResetHandler); goto aaa ; + 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); } } @@ -239,7 +254,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; @@ -294,7 +309,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeString: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -308,7 +323,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeFunction: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -322,7 +337,7 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea }else{ iresult = Sm1_executeStringByLocalParser(); } - OxCritical = 1; signal(SIGUSR1,controlResetHandler); + OxCritical = 1; mysignal(SIGUSR1,controlResetHandler); if (iresult < 0) { emsg = Sm1_popErrorMessage("executeFunctionWithOptionalArgument: "); Sm1_pushError2(SerialCurrent,-1,emsg); @@ -348,6 +363,8 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea fprintf(stderr,"This command has not yet been implemented.\n"); return(-1); break; + case SM_nop: + break; default: fprintf(stderr,"Fatal error. Unknown function_id %d\n",id); return(-1); @@ -357,11 +374,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; } } } @@ -369,7 +386,7 @@ 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; @@ -377,10 +394,10 @@ void controlResetHandler(sig) return; }else{ (void) traceShowStack(); traceClearStack(); -#if defined(__CYGWIN__) - siglongjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */ +#if defined(__CYGWIN__) || defined(__MSYS__) + MYSIGLONGJMP(EnvOfChildServer,2); /* returns 2 for ctrl-C */ #else - longjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */ + MYLONGJMP(EnvOfChildServer,2); /* returns 2 for ctrl-C */ #endif } }