=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.89 retrieving revision 1.98 diff -u -p -r1.89 -r1.98 --- OpenXM_contrib2/asir2000/parse/glob.c 2015/08/08 14:19:42 1.89 +++ OpenXM_contrib2/asir2000/parse/glob.c 2018/03/27 06:29:19 1.98 @@ -45,17 +45,18 @@ * 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.88 2015/08/06 10:01:53 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.97 2017/08/30 09:40:30 ohara Exp $ */ #include "ca.h" #include "al.h" #include "parse.h" #include "ox.h" -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) +#include +#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__) #include #endif -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) #include #include #else @@ -68,7 +69,7 @@ #include #endif -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) #define HISTORY asir_history #endif @@ -122,6 +123,7 @@ struct oVL oVLIST[52]; VL CO = oVLIST; VL ALG; +VL LASTCO; struct oVS oGPVS,oAPVS,oEPVS,oPPVS; VS GPVS = &oGPVS; @@ -143,7 +145,7 @@ struct oF oF_TRUE,oF_FALSE; F F_TRUE = &oF_TRUE; F F_FALSE = &oF_FALSE; -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) char cppname[BUFSIZ] = "c:\\asir\\stdlib\\cpp "; #else char cppname[BUFSIZ] = "/lib/cpp "; @@ -161,9 +163,10 @@ 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)); + LASTCO = &oVLIST[i]; + 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 +192,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; @@ -225,15 +229,20 @@ void asir_terminate(int status) LONGJMP(asir_infile->jmpbuf,status); else { if ( user_quit_handler ) { - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr,"Calling the registered quit callbacks..."); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } for ( n = user_quit_handler; n; n = NEXT(n) ) bevalf((FUNC)BDY(n),0); - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "done.\n"); -#if defined(__MINGW32__) || defined(__MINGW64__) - fflush(stderr); +#if defined(__MINGW32__) + fflush(stderr); #endif + } } tty_reset(); #if defined(MPI) @@ -242,7 +251,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 @@ -285,7 +294,7 @@ void sprompt(char *ptr) sprintf(ptr,"[%d] ",APVS->n); } -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) static int which(char *prog, char *path, char *buf, size_t size) { char *tok; @@ -318,7 +327,7 @@ static int which(char *prog, char *path, char *buf, si void cppname_init() { -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) char *oxhome; char oxcpp[BUFSIZ]; #define OXCPP "/bin/ox_cpp" @@ -348,6 +357,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) ) { @@ -368,12 +380,17 @@ 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"); if ( !in_fp ) { fprintf(stderr,"%s does not exist!\n",*(av+1)); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) fflush(stderr); #endif asir_terminate(1); @@ -395,7 +412,7 @@ void process_args(int ac,char **av) void GC_set_max_heap_size(int); GC_set_max_heap_size(atoi(*(av+1))); av += 2; ac -= 2; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) } else if ( !strcmp(*av,"-display") && (ac >= 2) ) { strcpy(displayname,*(av+1)); av += 2; ac -= 2; #endif @@ -405,7 +422,7 @@ void process_args(int ac,char **av) #endif } else { fprintf(stderr,"%s : unknown option.\n",*av); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) fflush(stderr); #endif asir_terminate(1); @@ -424,48 +441,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__) && !defined(__MINGW64__) - signal(SIGINT,int_handler); +#if !defined(VISUAL) && !defined(__MINGW32__) + 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__) && !defined(__MINGW64__) - signal(SIGBUS,bus_handler); +#if !defined(VISUAL) && !defined(__MINGW32__) + 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; @@ -475,24 +507,24 @@ void resetenv(char *s) extern FILE *outfile; fprintf(stderr,"%s\n",s); -#if defined(__MINGW32__) || defined(__MINGW64__) - fflush(stderr); -#endif while ( NEXT(asir_infile) ) closecurrentinput(); resetpvs(); -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( do_server_in_X11 ) #endif show_debug_window(0); #if defined(VISUAL_LIB) w_noflush_stderr(0); #endif +#if defined(__MINGW32__) + fflush(stderr); +#endif asir_out = stdout; /* restore states */ reset_engine(); reset_io(); -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) reset_timer(); #endif LONGJMP(main_env,1); @@ -505,17 +537,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; } @@ -523,11 +556,11 @@ void int_handler(int sig) caught_intr = 1; return; } -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) suspend_timer(); #endif - signal(SIGINT,SIG_IGN); -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) + 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); restore_handler(); @@ -561,6 +594,9 @@ void int_handler(int sig) fgets(buf,BUFSIZ,stdin); if ( !strncmp(buf,"y",1) ) { fprintf(stderr,"Bye\n"); +#if defined(__MINGW32__) + fflush(stderr); +#endif /* for terminating myself */ asir_infile = 0; asir_terminate(1); @@ -587,18 +623,24 @@ void int_handler(int sig) restore_handler(); if ( c == 'u' ) { if ( user_int_handler ) { - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "Calling the registered exception callbacks..."); +#if defined(__MINGW32__) + fflush(stderr); +#endif + } for ( t = user_int_handler; t; t = NEXT(t) ) bevalf((FUNC)BDY(t),0); - if ( !do_terse ) + if ( !do_terse ) { fprintf(stderr, "done.\n"); -#if defined(__MINGW32__) || defined(__MINGW64__) - fflush(stderr); +#if defined(__MINGW32__) + fflush(stderr); #endif + } } } + LEAVE_SIGNAL_CS_ALL; resetenv("return to toplevel"); break; case 'd': @@ -616,8 +658,8 @@ void int_handler(int sig) break; case '?': fprintf(stderr, "q:quit t:toplevel c:continue d:debug u:call registered handler w:where\n"); -#if defined(__MINGW32__) || defined(__MINGW64__) - fflush(stderr); +#if defined(__MINGW32__) + fflush(stderr); #endif break; default: @@ -627,18 +669,18 @@ void int_handler(int sig) } void restore_handler() { -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#if defined(VISUAL) || defined(__MINGW32__) 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 } @@ -646,7 +688,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 } @@ -662,7 +704,7 @@ void ill_handler(int sig) void alrm_handler(int sig) { fprintf(stderr,"interval timer expired (VTALRM)\n"); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) fflush(stderr); #endif LONGJMP(timer_env,1); @@ -671,7 +713,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 } @@ -679,7 +721,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 } @@ -687,7 +729,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 @@ -718,12 +760,12 @@ void error(char *s) { SNODE *snp=0; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( !error_in_timer && timer_is_set ) alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) fflush(stderr); #endif set_lasterror(s); @@ -758,12 +800,12 @@ void goto_toplevel(char *s) { SNODE *snp=0; -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) if ( timer_is_set ) alrm_handler(SIGNAL_FOR_TIMER); #endif fprintf(stderr,"%s\n",s); -#if defined(__MINGW32__) || defined(__MINGW64__) +#if defined(__MINGW32__) fflush(stderr); #endif if ( do_file ) { @@ -776,7 +818,7 @@ void goto_toplevel(char *s) resetenv("return to toplevel"); } -#if !defined(VISUAL) && !defined(__MINGW32__) && !defined(__MINGW64__) +#if !defined(VISUAL) && !defined(__MINGW32__) #include void set_timer(int interval) @@ -788,7 +830,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; } @@ -801,7 +843,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 @@ -853,18 +895,70 @@ char *scopyright() return notice; } -#if defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__) +#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