X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=ec0d5bc7eb1fa51414e0d1b38b594a897141de95;hb=c2bce3b9eb9f51fb0657af3c9023fff86ba3a51f;hp=7b070c96a94aaab6415c43393e7a3d7e3423c883;hpb=5813c792f8a5d69dd796d2b545b8f7867ddef389;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 7b070c9..ec0d5bc 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -13,6 +13,8 @@ * files for more information. */ +#include "sbcl.h" + #include #include #include @@ -24,7 +26,9 @@ #include #include #include +#ifdef LISP_FEATURE_SB_THREAD #include +#endif #include #include @@ -35,7 +39,6 @@ #include "signal.h" #include "runtime.h" -#include "sbcl.h" #include "alloc.h" #include "vars.h" #include "globals.h" @@ -59,6 +62,11 @@ #include #include "interr.h" #endif + +#ifndef SBCL_HOME +#define SBCL_HOME "/usr/local/lib/sbcl/" +#endif + /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */ static void @@ -112,13 +120,13 @@ copied_existing_filename_or_null(char *filename) } /* Convert a null-terminated array of null-terminated strings (e.g. - * argv or envp) into a Lisp list of Lisp strings. */ + * argv or envp) into a Lisp list of Lisp base-strings. */ static lispobj -alloc_string_list(char *array_ptr[]) +alloc_base_string_list(char *array_ptr[]) { if (*array_ptr) { - return alloc_cons(alloc_string(*array_ptr), - alloc_string_list(1 + array_ptr)); + return alloc_cons(alloc_base_string(*array_ptr), + alloc_base_string_list(1 + array_ptr)); } else { return NIL; } @@ -275,46 +283,36 @@ main(int argc, char *argv[], char *envp[]) /* If no core file was specified, look for one. */ if (!core) { char *sbcl_home = getenv("SBCL_HOME"); - if (sbcl_home) { - char *lookhere; - char *stem = "/sbcl.core"; - lookhere = (char *) calloc(strlen(sbcl_home) + - strlen(stem) + - 1, - sizeof(char)); - sprintf(lookhere, "%s%s", sbcl_home, stem); - core = copied_existing_filename_or_null(lookhere); - free(lookhere); - } else { - putenv("SBCL_HOME=/usr/local/lib/sbcl/"); - core = copied_existing_filename_or_null("/usr/local/lib/sbcl/sbcl.core"); - if (!core) { - putenv("SBCL_HOME=/usr/lib/sbcl/"); - core = - copied_existing_filename_or_null("/usr/lib/sbcl/sbcl.core"); - } - } + char *lookhere; + char *stem = "/sbcl.core"; + if(!sbcl_home) sbcl_home = SBCL_HOME; + lookhere = (char *) calloc(strlen(sbcl_home) + + strlen(stem) + + 1, + sizeof(char)); + sprintf(lookhere, "%s%s", sbcl_home, stem); + core = copied_existing_filename_or_null(lookhere); + free(lookhere); if (!core) { lose("can't find core file"); } - } else { - /* If a core was specified and SBCL_HOME is unset, set it */ - char *sbcl_home = getenv("SBCL_HOME"); - if (!sbcl_home) { - char *envstring, *copied_core, *dir; - char *stem = "SBCL_HOME="; - copied_core = copied_string(core); - dir = dirname(copied_core); - envstring = (char *) calloc(strlen(stem) + - strlen(dir) + - 1, - sizeof(char)); - sprintf(envstring, "%s%s", stem, dir); - putenv(envstring); - free(copied_core); - } } - + /* Make sure that SBCL_HOME is set, no matter where the core was + * found */ + if (!getenv("SBCL_HOME")) { + char *envstring, *copied_core, *dir; + char *stem = "SBCL_HOME="; + copied_core = copied_string(core); + dir = dirname(copied_core); + envstring = (char *) calloc(strlen(stem) + + strlen(dir) + + 1, + sizeof(char)); + sprintf(envstring, "%s%s", stem, dir); + putenv(envstring); + free(copied_core); + } + if (!noinform) { print_banner(); fflush(stdout); @@ -349,7 +347,7 @@ main(int argc, char *argv[], char *envp[]) /* Convert remaining argv values to something that Lisp can grok. */ SHOW("setting POSIX-ARGV symbol value"); - SetSymbolValue(POSIX_ARGV, alloc_string_list(argv),0); + SetSymbolValue(POSIX_ARGV, alloc_base_string_list(argv),0); /* Install a handler to pick off SIGINT until the Lisp system gets * far enough along to install its own handler. */ @@ -376,73 +374,14 @@ static void parent_sighandler(int signum,siginfo_t *info, void *void_context) } #ifdef LISP_FEATURE_SB_THREAD -static void parent_do_garbage_collect(void) -{ - int waiting_threads=0; - struct thread *th; - int status,p; - - for_each_thread(th) { - if(ptrace(PTRACE_ATTACH,th->pid,0,0)) { - fprintf(stderr,"attaching to %d ...",th->pid); - perror("PTRACE_ATTACH"); - } - else waiting_threads++; - } - stop_the_world=1; - - do { - /* not sure if we have to wait for PTRACE_ATTACH to finish - * before we can send PTRACE_CONT, so let's play it safe - */ - while(waiting_threads>0) { - if((p=waitpid(-1,&status, WUNTRACED|__WALL))>0) { - if(WIFEXITED(status) || WIFSIGNALED(status)) - destroy_thread(find_thread_by_pid(p)); - else { -#if 0 - fprintf(stderr, "wait returned pid %d signal %x\n", - p,WSTOPSIG(status)); -#endif - if(WSTOPSIG(status)==SIGTRAP) { - if(ptrace(PTRACE_CONT,p,0,SIGTRAP)) - perror("PTRACE_CONT"); - } - else waiting_threads--; - } - } - } - for_each_thread(th) { - if(SymbolTlValue(PSEUDO_ATOMIC_ATOMIC,th)) { - /* restart the child, setting *p-a-i* which will cause it - * to go into interrupt_handle_pending as soon as it's - * finished being pseudo_atomic. once there it will - * signal itself SIGSTOP, which will give us another - * event to wait for */ - fprintf(stderr, "%d was pseudo-atomic, letting it resume \n", - th->pid); - SetTlSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,1,th) ; - if(ptrace(PTRACE_CONT,th->pid,0,0)) - perror("PTRACE_CONT"); - waiting_threads++; - } - } - } while (waiting_threads>0); - - collect_garbage(maybe_gc_pending-1); - maybe_gc_pending=0; - stop_the_world=0; - /* fprintf(stderr, "gc done\n"); */ - for_each_thread(th) - if(ptrace(PTRACE_DETACH,th->pid,0,0)) - perror("PTRACE_DETACH"); -} +int show_thread_exit=0; static void /* noreturn */ parent_loop(void) { struct sigaction sa; sigset_t sigset; int status; + pid_t pid=0; sigemptyset(&sigset); @@ -464,29 +403,24 @@ static void /* noreturn */ parent_loop(void) while(!all_threads) { sched_yield(); } - - while(all_threads) { - pid_t pid=0; - while(pid=waitpid(-1,&status,__WALL|WUNTRACED)) { - struct thread *th; - if(pid==-1) { - if(errno == EINTR) { - if(maybe_gc_pending) parent_do_garbage_collect(); - continue; - } - if(errno == ECHILD) break; - fprintf(stderr,"waitpid: %s\n",strerror(errno)); + while(all_threads && (pid=waitpid(-1,&status,__WALL))) { + struct thread *th; + int real_errno=errno; + if(pid==-1) { + if(real_errno == EINTR) { continue; } + if(real_errno == ECHILD) break; + fprintf(stderr,"waitpid: %s\n",strerror(real_errno)); + continue; + } + if(WIFEXITED(status) || WIFSIGNALED(status)) { th=find_thread_by_pid(pid); if(!th) continue; - if(WIFEXITED(status) || WIFSIGNALED(status)) { + if(show_thread_exit) fprintf(stderr,"waitpid : child %d %x exited \n", pid,th); - destroy_thread(th); - /* FIXME arrange to call or fake (free-mutex *session-lock*) - * if necessary */ - if(!all_threads) break; - } + destroy_thread(th); + if(!all_threads) break; } } exit(WEXITSTATUS(status));