X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=a457dd8fd9f0920df7a7162c8ce15be1e679f216;hb=baf5f781af1b88919b929c33e06f235f84e4cfb4;hp=115a24b8af694bcd695b6a3f9bd816fecea27c95;hpb=f5146484af254ef6812f0417deed9ccd5c2eda27;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 115a24b..a457dd8 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -28,6 +28,7 @@ #include #include #include +#include #if defined(SVR4) || defined(__linux__) #include @@ -166,27 +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); } - -FILE *stdlog; int @@ -195,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; @@ -202,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 */ @@ -258,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 @@ -269,10 +264,9 @@ 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; } } @@ -340,58 +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 - parent_loop(); -#endif + create_initial_thread(initial_function); + lose("CATS. CATS ARE NICE."); + return 0; } -#ifdef LISP_FEATURE_SB_THREAD - -/* this is being pared down as time goes on; eventually we want to get - * to the point that we have no parent loop at all and the parent - * thread runs Lisp just like any other */ - -static void /* noreturn */ parent_loop(void) -{ - struct sigaction sa; - sigset_t sigset; - int status; - pid_t pid=0; - - sigemptyset(&sigset); - sa.sa_handler=SIG_IGN; - sa.sa_mask=sigset; - sa.sa_flags=0; - sigaction(SIGINT, &sa, 0); /* ^c should go to the lisp thread instead */ - sigaction(SIG_THREAD_EXIT, &sa, 0); - sigaction(SIGCHLD, &sa, 0); - - while(!all_threads) { - sched_yield(); - } - while(all_threads && (pid=waitpid(-1,&status,__WALL))) { - struct thread *th; - if(pid==-1) { - if(errno == EINTR) continue; - fprintf(stderr,"waitpid: %s\n",strerror(errno)); - } - else if(WIFEXITED(status) || WIFSIGNALED(status)) { - th=find_thread_by_pid(pid); - if(!th) continue; - destroy_thread(th); - if(!all_threads) break; - } - } - exit(WEXITSTATUS(status)); -} - -#endif