X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=72fc56a9f90fd62d61ad3d49525e8f717f8b6f2e;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=ec0d5bc7eb1fa51414e0d1b38b594a897141de95;hpb=44dbdff97fbcc1e5b12e1330da92c5a3dcb94a3b;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index ec0d5bc..72fc56a 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -26,9 +26,6 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <signal.h>
-#ifdef LISP_FEATURE_SB_THREAD
-#include <sys/ptrace.h>
-#endif
 #include <sched.h>
 #include <errno.h>
 
@@ -170,26 +167,15 @@ print_banner()
     printf(
 "This is SBCL %s, an implementation of ANSI Common Lisp.\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\
+More information about SBCL is available at <http://www.sbcl.org/>.\
 \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 <http://sbcl.sourceforge.net/>.\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;
 
 
@@ -318,9 +304,6 @@ main(int argc, char *argv[], char *envp[])
 	fflush(stdout);
     }
 
-#ifdef MACH
-    mach_init();
-#endif
 #if defined(SVR4) || defined(__linux__)
     tzset();
 #endif
@@ -357,24 +340,15 @@ main(int argc, char *argv[], char *envp[])
     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
-}
-
 #ifdef LISP_FEATURE_SB_THREAD
-int show_thread_exit=0;
+
+/* 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)
 {
@@ -384,41 +358,25 @@ static void /* noreturn */ parent_loop(void)
     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);
+    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;
-	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(errno == EINTR) continue;
+	    fprintf(stderr,"waitpid: %s\n",strerror(errno));
 	}
-	if(WIFEXITED(status) || WIFSIGNALED(status)) {
+	else 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;
 	}