X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=545fb3514e637e1cae1ed6831ff09ccfabb9c115;hb=83312cce6ee1c74fe99805831afb5cfbcb4248bd;hp=166e7acddf9f38f588ff761e517c8e7878b0043a;hpb=391395fb5cdadf4a5c684c6253471816c16df794;p=sbcl.git diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index 166e7ac..545fb35 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -166,7 +166,7 @@ print_banner() { printf( "This is SBCL %s, an implementation of ANSI Common Lisp.\n\ -More information about SBCL is available at . +More information about SBCL is available at .\n\ \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\ @@ -174,8 +174,6 @@ BSD-style licenses. See the CREDITS and COPYING files in the\n\ distribution for more information.\n\ ", SBCL_VERSION_STRING); } - -FILE *stdlog; int @@ -336,51 +334,7 @@ main(int argc, char *argv[], char *envp[]) 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 -} - -#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)); + create_initial_thread(initial_function); + lose("CATS. CATS ARE NICE."); } -#endif