X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=a457dd8fd9f0920df7a7162c8ce15be1e679f216;hb=baf5f781af1b88919b929c33e06f235f84e4cfb4;hp=ae360ae898e36a6dc1e529f9b260f060af58d999;hpb=2675adcb29d689ee6d270f52658af17f2deeaf77;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index ae360ae..a457dd8 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -26,11 +26,9 @@ #include #include #include -#ifdef LISP_FEATURE_SB_THREAD -#include -#endif #include #include +#include #if defined(SVR4) || defined(__linux__) #include @@ -62,6 +60,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 @@ -164,28 +167,14 @@ print_banner() { printf( "This is SBCL %s, an implementation of ANSI Common Lisp.\n\ +More information about SBCL is available at .\n\ \n\ -SBCL is derived from the CMU CL system created at Carnegie Mellon University.\n\ -Besides software and documentation originally created at Carnegie Mellon\n\ -University, SBCL contains some software originally from the Massachusetts\n\ -Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and\n\ -material contributed by volunteers since the release of CMU CL into the\n\ -public domain. See the CREDITS file in the distribution for more information.\n\ -\n\ -SBCL is a free software system, provided as is, with absolutely no warranty.\n\ -It is mostly in the public domain, but also includes some software copyrighted\n\ - Massachusetts Institute of Technology, 1986;\n\ - Symbolics, Inc., 1989, 1990, 1991, 1992; and\n\ - Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990\n\ -used under BSD-style licenses allowing copying only under certain conditions.\n\ -See the COPYING file in the distribution for more information.\n\ -\n\ -More information about SBCL is available at .\n\ +SBCL is free software, provided as is, with absolutely no warranty.\n\ +It is mostly in the public domain; some portions are provided under\n\ +BSD-style licenses. See the CREDITS and COPYING files in the\n\ +distribution for more information.\n\ ", SBCL_VERSION_STRING); } - -int gc_thread_pid; -FILE *stdlog; int @@ -194,6 +183,7 @@ main(int argc, char *argv[], char *envp[]) /* the name of the core file we're to execute. Note that this is * a malloc'ed string which should be freed eventually. */ char *core = 0; + char **sbcl_argv = 0; /* other command line options */ boolean noinform = 0; @@ -201,6 +191,8 @@ main(int argc, char *argv[], char *envp[]) lispobj initial_function; + setlocale(LC_ALL, ""); + /* KLUDGE: os_vm_page_size is set by os_init(), and on some * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so * it must follow os_init(). -- WHN 2000-01-26 */ @@ -257,6 +249,10 @@ main(int argc, char *argv[], char *envp[]) { char *argi0 = argv[argi]; int argj = 1; + /* (argc - argi) for the arguments, one for the binary, + and one for the terminating NULL. */ + sbcl_argv = successful_malloc((2 + argc - argi) * sizeof(char *)); + sbcl_argv[0] = argv[0]; while (argi < argc) { char *arg = argv[argi++]; /* If we encounter --end-runtime-options for the first @@ -268,64 +264,50 @@ main(int argc, char *argv[], char *envp[]) 0 == strcmp(arg, "--end-runtime-options")) { lose("bad runtime option \"%s\"", argi0); } - argv[argj++] = arg; + sbcl_argv[argj++] = arg; } - argv[argj] = 0; - argc = argj; + sbcl_argv[argj] = 0; } } /* 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); } -#ifdef MACH - mach_init(); -#endif #if defined(SVR4) || defined(__linux__) tzset(); #endif @@ -352,81 +334,16 @@ 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_base_string_list(argv),0); + SetSymbolValue(POSIX_ARGV, alloc_base_string_list(sbcl_argv),0); + free(sbcl_argv); /* 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)); - create_thread(initial_function); - /* in a unithread build, create_thread never returns */ -#ifdef LISP_FEATURE_SB_THREAD - gc_thread_pid=getpid(); - parent_loop(); -#endif -} - -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 + create_initial_thread(initial_function); + lose("CATS. CATS ARE NICE."); + return 0; } -#ifdef LISP_FEATURE_SB_THREAD - -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; - fprintf(stderr,"waitpid : child %d %x exited \n", pid,th); - destroy_thread(th); - if(!all_threads) break; - } - } - exit(WEXITSTATUS(status)); -} - -#endif