X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=ec0d5bc7eb1fa51414e0d1b38b594a897141de95;hb=dcf5978d9d33098e868ae6eea28e1b310038c03d;hp=087efc45b2aaca8fe6c2a8d275a0f8155a420e8c;hpb=3bb2fb5b9ecdeebecaded4ac6e5af0f653be8867;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 087efc4..ec0d5bc 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -13,15 +13,24 @@ * files for more information. */ +#include "sbcl.h" + #include #include #include #include +#include #include #include #include #include #include +#include +#ifdef LISP_FEATURE_SB_THREAD +#include +#endif +#include +#include #if defined(SVR4) || defined(__linux__) #include @@ -30,7 +39,6 @@ #include "signal.h" #include "runtime.h" -#include "sbcl.h" #include "alloc.h" #include "vars.h" #include "globals.h" @@ -44,6 +52,7 @@ #include "core.h" #include "save.h" #include "lispregs.h" +#include "thread.h" #include "genesis/static-symbols.h" #include "genesis/symbol.h" @@ -53,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 @@ -106,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; } @@ -175,6 +189,10 @@ More information about SBCL is available at .\n\ ", SBCL_VERSION_STRING); } +int gc_thread_pid; +FILE *stdlog; + + int main(int argc, char *argv[], char *envp[]) { @@ -265,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); @@ -333,35 +341,89 @@ main(int argc, char *argv[], char *envp[]) gc_initialize_pointers(); -#ifdef BINDING_STACK_POINTER - SetSymbolValue(BINDING_STACK_POINTER, BINDING_STACK_START); -#endif - interrupt_init(); - arch_install_interrupt_handlers(); os_install_interrupt_handlers(); -#ifdef PSEUDO_ATOMIC_ATOMIC - /* Turn on pseudo atomic for when we call into Lisp. */ - SHOW("turning on pseudo atomic"); - SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1)); - SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0)); -#endif - /* Convert remaining argv values to something that Lisp can grok. */ SHOW("setting POSIX-ARGV symbol value"); - SetSymbolValue(POSIX_ARGV, alloc_string_list(argv)); + 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. */ sigint_init(); FSHOW((stderr, "/funcalling initial_function=0x%lx\n", initial_function)); - funcall0(initial_function); + create_thread(initial_function); + /* in a unithread build, create_thread never returns */ +#ifdef LISP_FEATURE_SB_THREAD + gc_thread_pid=getpid(); + parent_loop(); +#endif +} - /* initial_function() is not supposed to return. */ - lose("Lisp initial_function gave up control."); - return 0; /* dummy value: return something */ +static void parent_sighandler(int signum,siginfo_t *info, void *void_context) +{ +#if 0 + os_context_t *context = (os_context_t*)void_context; + fprintf(stderr, + "parent thread got signal %d from %d, maybe_gc_pending=%d\n", + signum, info->si_pid, + maybe_gc_pending); +#endif } +#ifdef LISP_FEATURE_SB_THREAD +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); + + sigaddset(&sigset, SIGALRM); + sigaddset(&sigset, SIGCHLD); + sigprocmask(SIG_UNBLOCK,&sigset,0); + sa.sa_handler=parent_sighandler; + sa.sa_mask=sigset; + sa.sa_flags=SA_SIGINFO; + sigaction(SIGALRM, &sa, 0); + sigaction(SIGCHLD, &sa, 0); + + sigemptyset(&sigset); + sa.sa_handler=SIG_IGN; + sa.sa_mask=sigset; + sa.sa_flags=0; + sigaction(SIGINT, &sa, 0); + + while(!all_threads) { + sched_yield(); + } + 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(show_thread_exit) + fprintf(stderr,"waitpid : child %d %x exited \n", pid,th); + destroy_thread(th); + if(!all_threads) break; + } + } + exit(WEXITSTATUS(status)); +} + +#endif