#include <string.h>
#include "interr.h"
#endif
+
+#ifndef SBCL_HOME
+#define SBCL_HOME "/usr/local/lib/sbcl/"
+#endif
+
\f
/* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */
static void
/* 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 LISP_FEATURE_SB_THREAD
-static void parent_do_garbage_collect(void)
-{
- int waiting_threads=0;
- struct thread *th;
- int status,p;
-
- for_each_thread(th) {
- if(ptrace(PTRACE_ATTACH,th->pid,0,0)) {
- perror("PTRACE_ATTACH");
- }
- else waiting_threads++;
- }
- stop_the_world=1;
-
- do {
- /* not sure if we have to wait for PTRACE_ATTACH to finish
- * before we can send PTRACE_CONT, so let's play it safe
- */
- while(waiting_threads>0) {
- if((p=waitpid(-1,&status, WUNTRACED|__WALL))>0) {
- if(WIFEXITED(status) || WIFSIGNALED(status))
- destroy_thread(find_thread_by_pid(p));
- else {
-#if 0
- fprintf(stderr, "wait returned pid %d signal %x\n",
- p,WSTOPSIG(status));
-#endif
- if(WSTOPSIG(status)==SIGTRAP) {
- if(ptrace(PTRACE_CONT,p,0,SIGTRAP))
- perror("PTRACE_CONT");
- }
- else waiting_threads--;
- }
- }
- }
- for_each_thread(th) {
- if(SymbolTlValue(PSEUDO_ATOMIC_ATOMIC,th)) {
- /* restart the child, setting *p-a-i* which will cause it
- * to go into interrupt_handle_pending as soon as it's
- * finished being pseudo_atomic. once there it will
- * signal itself SIGSTOP, which will give us another
- * event to wait for */
-#if 0
- fprintf(stderr, "%d was pseudo-atomic, letting it resume \n",
- th->pid);
-#endif
- SetTlSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,make_fixnum(1),th);
- if(ptrace(PTRACE_CONT,th->pid,0,0))
- perror("PTRACE_CONT");
- waiting_threads++;
- }
- }
- } while (waiting_threads>0);
-
- collect_garbage(maybe_gc_pending-1);
- maybe_gc_pending=0;
- stop_the_world=0;
- for_each_thread(th)
- if(ptrace(PTRACE_DETACH,th->pid,0,0))
- perror("PTRACE_DETACH");
-}
+int show_thread_exit=0;
static void /* noreturn */ parent_loop(void)
{
sigemptyset(&sigset);
- sigaddset(&sigset, SIGALRM);
sigaddset(&sigset, SIGCHLD);
+ sigaddset(&sigset, SIG_THREAD_EXIT);
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_mask=sigset;
sa.sa_flags=0;
sigaction(SIGINT, &sa, 0);
+ sigaction(SIG_THREAD_EXIT, &sa, 0);
while(!all_threads) {
sched_yield();
}
- maybe_gc_pending=0;
- while(all_threads && (pid=waitpid(-1,&status,__WALL|WUNTRACED))) {
+ while(all_threads && (pid=waitpid(-1,&status,__WALL))) {
struct thread *th;
int real_errno=errno;
- while(maybe_gc_pending) parent_do_garbage_collect();
if(pid==-1) {
if(real_errno == EINTR) {
continue;
fprintf(stderr,"waitpid: %s\n",strerror(real_errno));
continue;
}
- th=find_thread_by_pid(pid);
- if(!th) continue;
if(WIFEXITED(status) || WIFSIGNALED(status)) {
- fprintf(stderr,"waitpid : child %d %x exited \n", pid,th);
- destroy_thread(th);
- /* FIXME arrange to call or fake (free-mutex *session-lock*)
- * if necessary */
+ 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;
}
}
projects / sbcl.git / blobdiff