=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.90 retrieving revision 1.97 diff -u -p -r1.90 -r1.97 --- OpenXM_contrib2/asir2000/parse/glob.c 2015/08/14 13:51:56 1.90 +++ OpenXM_contrib2/asir2000/parse/glob.c 2017/08/30 09:40:30 1.97 @@ -45,12 +45,13 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.89 2015/08/08 14:19:42 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.96 2017/08/29 07:18:30 ohara Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" #include "ox.h" +#include #if !defined(VISUAL) && !defined(__MINGW32__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) #include #endif @@ -161,9 +162,9 @@ void glob_init() { VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = &oVLIST[i+1]; } VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = 0; - reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); - reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); - reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); CPVS = GPVS; MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),NULLP); OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0; @@ -189,6 +190,7 @@ void notdef(VL vl,Obj a,Obj b,Obj *c) error("undefined arithmetic operation."); } +int disable_debugger; int do_asirrc; int do_file; char *do_filename; @@ -247,7 +249,7 @@ void asir_terminate(int status) mpi_finalize(); #else #if defined(SIGPIPE) - signal(SIGPIPE,SIG_IGN); + set_signal(SIGPIPE,SIG_IGN); #endif close_allconnections(); #endif @@ -353,6 +355,9 @@ void process_args(int ac,char **av) #if !defined(MPI) do_message = 1; #endif +#if defined(VISUAL) && defined(VISUAL_CONSOLE) + disable_debugger=1; +#endif do_quiet = 0; while ( ac > 0 ) { if ( !strcmp(*av,"-heap") && (ac >= 2) ) { @@ -373,6 +378,11 @@ void process_args(int ac,char **av) av += 2; ac -= 2; } else if ( !strcmp(*av,"-cpp") && (ac >= 2) ) { strcpy(cppname,*(av+1)); av += 2; ac -= 2; + } else if ( !strcmp(*av,"-d") && (ac >= 2) ) { +#if defined(VISUAL) && defined(VISUAL_CONSOLE) + disable_debugger=0; +#endif + av += 2; ac -= 2; } else if ( !strcmp(*av,"-f") && (ac >= 2) ) { do_quiet = 1; in_fp = fopen(*(av+1),"r"); @@ -429,48 +439,63 @@ void process_args(int ac,char **av) #endif } -#include +#if defined(HAVE_SIGACTION) +void (*set_signal(int sig, void (*handler)(int)))(int) +{ + struct sigaction act; + struct sigaction oldact; + if (handler == SIG_IGN || handler == SIG_DFL) { + return signal(sig,handler); + } + act.sa_handler=handler; + act.sa_flags=0; + act.sa_flags |= SA_RESTART; + sigemptyset(&act.sa_mask); + sigaction(sig,&act,&oldact); + return oldact.sa_handler; +} +#endif void sig_init() { #if !defined(VISUAL) && !defined(__MINGW32__) - signal(SIGINT,int_handler); + set_signal(SIGINT,int_handler); #else void register_ctrlc_handler(); register_ctrlc_handler(); #endif - signal(SIGSEGV,segv_handler); + set_signal(SIGSEGV,segv_handler); #if defined(SIGFPE) - signal(SIGFPE,fpe_handler); + set_signal(SIGFPE,fpe_handler); #endif #if defined(SIGPIPE) - signal(SIGPIPE,pipe_handler); + set_signal(SIGPIPE,pipe_handler); #endif #if defined(SIGILL) - signal(SIGILL,ill_handler); + set_signal(SIGILL,ill_handler); #endif #if !defined(VISUAL) && !defined(__MINGW32__) - signal(SIGBUS,bus_handler); + set_signal(SIGBUS,bus_handler); #endif } static void (*old_int)(int); void asir_save_handler() { - old_int = signal(SIGINT,SIG_IGN); - signal(SIGINT,old_int); + old_int = set_signal(SIGINT,SIG_IGN); + set_signal(SIGINT,old_int); } void asir_set_handler() { - signal(SIGINT,int_handler); + set_signal(SIGINT,int_handler); } void asir_reset_handler() { - signal(SIGINT,old_int); + set_signal(SIGINT,old_int); } extern int I_am_server; @@ -510,17 +535,18 @@ void fatal(int n) extern int ox_int_received, critical_when_signal; extern int in_gc, caught_intr; +extern int ox_get_pari_result; void int_handler(int sig) { extern NODE PVSS; NODE t; - - if ( do_file ) { + if ( do_file || disable_debugger ) { + LEAVE_SIGNAL_CS_ALL; ExitAsir(); } - if ( critical_when_signal ) { + if ( !ox_get_pari_result && critical_when_signal ) { ox_int_received = 1; return; } @@ -531,7 +557,7 @@ void int_handler(int sig) #if defined(VISUAL) || defined(__MINGW32__) suspend_timer(); #endif - signal(SIGINT,SIG_IGN); + set_signal(SIGINT,SIG_IGN); #if !defined(VISUAL) && !defined(__MINGW32__) if ( do_server_in_X11 ) { debug(PVSS?((VS)BDY(PVSS))->usrf->f.usrf->body:0); @@ -612,6 +638,7 @@ void int_handler(int sig) } } } + LEAVE_SIGNAL_CS_ALL; resetenv("return to toplevel"); break; case 'd': @@ -644,14 +671,14 @@ void restore_handler() { resume_timer(); #endif #if defined(SIGINT) - signal(SIGINT,int_handler); + set_signal(SIGINT,int_handler); #endif } void segv_handler(int sig) { #if defined(SIGSEGV) - signal(SIGSEGV,segv_handler); + set_signal_for_restart(SIGSEGV,segv_handler); error("internal error (SEGV)"); #endif } @@ -659,7 +686,7 @@ void segv_handler(int sig) void ill_handler(int sig) { #if defined(SIGILL) - signal(SIGILL,ill_handler); + set_signal_for_restart(SIGILL,ill_handler); error("illegal instruction (ILL)"); #endif } @@ -684,7 +711,7 @@ void alrm_handler(int sig) void bus_handler(int sig) { #if defined(SIGBUS) - signal(SIGBUS,bus_handler); + set_signal_for_restart(SIGBUS,bus_handler); error("internal error (BUS ERROR)"); #endif } @@ -692,7 +719,7 @@ void bus_handler(int sig) void fpe_handler(int sig) { #if defined(SIGFPE) - signal(SIGFPE,fpe_handler); + set_signal_for_restart(SIGFPE,fpe_handler); error("internal error (FPE)"); #endif } @@ -700,7 +727,7 @@ void fpe_handler(int sig) void pipe_handler(int sig) { #if defined(SIGPIPE) - signal(SIGPIPE,pipe_handler); + set_signal_for_restart(SIGPIPE,pipe_handler); end_critical(); error("internal error (BROKEN PIPE)"); #endif @@ -801,7 +828,7 @@ void set_timer(int interval) it.it_value.tv_sec = interval; it.it_value.tv_usec = 0; setitimer(ITIMER_TYPE,&it,0); - signal(SIGNAL_FOR_TIMER,alrm_handler); + set_signal(SIGNAL_FOR_TIMER,alrm_handler); timer_is_set = 1; } @@ -814,7 +841,7 @@ void reset_timer() it.it_value.tv_sec = 0; it.it_value.tv_usec = 0; setitimer(ITIMER_TYPE,&it,0); - signal(SIGNAL_FOR_TIMER,SIG_IGN); + set_signal(SIGNAL_FOR_TIMER,SIG_IGN); timer_is_set = 0; } #endif @@ -867,17 +894,69 @@ char *scopyright() } #if defined(VISUAL) || defined(__MINGW32__) +int recv_intr; + +static CRITICAL_SECTION signal_cs; +static int initialized_signal_cs; +static int signal_cs_count; + +static void init_signal_cs() +{ + if (!initialized_signal_cs) { + InitializeCriticalSection(&signal_cs); + initialized_signal_cs=1; + signal_cs_count=0; + } +} + +void try_enter_signal_cs() +{ + init_signal_cs(); + if(TryEnterCriticalSection(&signal_cs)) { + signal_cs_count++; + } +} + +void enter_signal_cs() +{ + init_signal_cs(); + EnterCriticalSection(&signal_cs); + signal_cs_count++; +} + +void leave_signal_cs() +{ + init_signal_cs(); + if(signal_cs_count>0) { + LeaveCriticalSection(&signal_cs); + signal_cs_count--; + } +} + +void leave_signal_cs_all() +{ + if (!initialized_signal_cs) { + init_signal_cs(); + } + while(signal_cs_count>0) { + LeaveCriticalSection(&signal_cs); + signal_cs_count--; + } +} + void check_intr() { extern int recv_intr; + enter_signal_cs(); if ( recv_intr ) { if ( recv_intr == 1 ) { recv_intr = 0; - int_handler(0); + int_handler(SIGINT); } else { recv_intr = 0; ox_usr1_handler(0); } } + leave_signal_cs_all(); } #endif