0.8.18.14:
[sbcl.git] / src / runtime / thread.c
index 1169840..2a174d6 100644 (file)
@@ -1,11 +1,15 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <sched.h>
 #include <signal.h>
 #include <stddef.h>
 #include <errno.h>
-#include "runtime.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #include "sbcl.h"
+#include "runtime.h"
 #include "validate.h"          /* for CONTROL_STACK_SIZE etc */
 #include "thread.h"
 #include "arch.h"
 #include "globals.h"
 #include "dynbind.h"
 #include "genesis/cons.h"
+#include "genesis/fdefn.h"
+#include "interr.h"             /* for lose() */
+#include "gc-internal.h"
+
 #define ALIEN_STACK_SIZE (1*1024*1024) /* 1Mb size chosen at random */
 
 int dynamic_values_bytes=4096*sizeof(lispobj); /* same for all threads */
@@ -21,8 +29,6 @@ struct thread *all_threads;
 volatile lispobj all_threads_lock;
 extern struct interrupt_data * global_interrupt_data;
 
-void get_spinlock(lispobj *word,int value);
-
 int
 initial_thread_trampoline(struct thread *th)
 {
@@ -34,7 +40,7 @@ initial_thread_trampoline(struct thread *th)
 
     if(th->pid < 1) lose("th->pid not set up right");
     th->state=STATE_RUNNING;
-#if defined(LISP_FEATURE_X86)
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
     return call_into_lisp_first_time(function,args,0);
 #else
     return funcall0(function);
@@ -47,6 +53,7 @@ initial_thread_trampoline(struct thread *th)
  * whatever other bookkeeping needs to be done
  */
 
+#ifdef LISP_FEATURE_SB_THREAD
 int
 new_thread_trampoline(struct thread *th)
 {
@@ -61,6 +68,7 @@ new_thread_trampoline(struct thread *th)
     th->state=STATE_RUNNING;
     return funcall0(function);
 }
+#endif /* LISP_FEATURE_SB_THREAD */
 
 /* this is called from any other thread to create the new one, and
  * initialize all parts of it that can be initialized from another 
@@ -133,11 +141,11 @@ struct thread * create_thread_struct(lispobj initial_function) {
     th->state=STATE_STOPPED;
 #ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
     th->alien_stack_pointer=((void *)th->alien_stack_start
-                            + ALIEN_STACK_SIZE-4); /* naked 4.  FIXME */
+                            + ALIEN_STACK_SIZE-N_WORD_BYTES);
 #else
     th->alien_stack_pointer=((void *)th->alien_stack_start);
 #endif
-#ifdef LISP_FEATURE_X86
+#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
     th->pseudo_atomic_interrupted=0;
     th->pseudo_atomic_atomic=0;
 #endif
@@ -152,13 +160,13 @@ struct thread * create_thread_struct(lispobj initial_function) {
      * we use the appropriate SymbolValue macros to access any of the
      * variable quantities from the C runtime.  It's not quite OAOOM,
      * it just feels like it */
-    SetSymbolValue(BINDING_STACK_START,th->binding_stack_start,th);
-    SetSymbolValue(CONTROL_STACK_START,th->control_stack_start,th);
-    SetSymbolValue(CONTROL_STACK_END,th->control_stack_end,th);
-#ifdef LISP_FEATURE_X86
-    SetSymbolValue(BINDING_STACK_POINTER,th->binding_stack_pointer,th);
-    SetSymbolValue(ALIEN_STACK,th->alien_stack_pointer,th);
-    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC,th->pseudo_atomic_atomic,th);
+    SetSymbolValue(BINDING_STACK_START,(lispobj)th->binding_stack_start,th);
+    SetSymbolValue(CONTROL_STACK_START,(lispobj)th->control_stack_start,th);
+    SetSymbolValue(CONTROL_STACK_END,(lispobj)th->control_stack_end,th);
+#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
+    SetSymbolValue(BINDING_STACK_POINTER,(lispobj)th->binding_stack_pointer,th);
+    SetSymbolValue(ALIEN_STACK,(lispobj)th->alien_stack_pointer,th);
+    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC,(lispobj)th->pseudo_atomic_atomic,th);
     SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th->pseudo_atomic_interrupted,th);
 #else
     current_binding_stack_pointer=th->binding_stack_pointer;
@@ -192,6 +200,11 @@ struct thread * create_thread_struct(lispobj initial_function) {
 
 void link_thread(struct thread *th,pid_t kid_pid)
 {
+    sigset_t newset,oldset;
+    sigemptyset(&newset);
+    sigaddset_blockable(&newset);
+    sigprocmask(SIG_BLOCK, &newset, &oldset); 
+
     get_spinlock(&all_threads_lock,kid_pid);
     th->next=all_threads;
     all_threads=th;
@@ -200,10 +213,12 @@ void link_thread(struct thread *th,pid_t kid_pid)
      */
     protect_control_stack_guard_page(th->pid,1);
     release_spinlock(&all_threads_lock);
+
+    sigprocmask(SIG_SETMASK,&oldset,0);
     th->pid=kid_pid;           /* child will not start until this is set */
 }
 
-pid_t create_initial_thread(lispobj initial_function) {
+void create_initial_thread(lispobj initial_function) {
     struct thread *th=create_thread_struct(initial_function);
     pid_t kid_pid=getpid();
     if(th && kid_pid>0) {
@@ -212,33 +227,41 @@ pid_t create_initial_thread(lispobj initial_function) {
     } else lose("can't create initial thread");
 }
 
-#ifdef LISP_FEATURE_LINUX
+#ifdef LISP_FEATURE_SB_THREAD
 pid_t create_thread(lispobj initial_function) {
     struct thread *th=create_thread_struct(initial_function);
-    pid_t kid_pid=clone(new_thread_trampoline,
-                       (((void*)th->control_stack_start)+
-                        THREAD_CONTROL_STACK_SIZE-4),
-                       CLONE_FILES|SIG_THREAD_EXIT|CLONE_VM,th);
-
-    if(th && kid_pid>0) {
+    pid_t kid_pid=0;
+
+    if(th==0) return 0;
+    kid_pid=clone(new_thread_trampoline,
+                 (((void*)th->control_stack_start)+
+                  THREAD_CONTROL_STACK_SIZE-4),
+                 CLONE_FILES|SIG_THREAD_EXIT|CLONE_VM,th);
+    
+    if(kid_pid>0) {
        link_thread(th,kid_pid);
        return th->pid;
     } else {
-       destroy_thread(th);
+       os_invalidate((os_vm_address_t) th->control_stack_start,
+                     ((sizeof (lispobj))
+                      * (th->control_stack_end-th->control_stack_start)) +
+                     BINDING_STACK_SIZE+ALIEN_STACK_SIZE+dynamic_values_bytes+
+                     32*SIGSTKSZ);
        return 0;
     }
 }
 #endif
 
+/* unused */
 void destroy_thread (struct thread *th)
 {
     /* precondition: the unix task has already been killed and exited.
-     * This is called by the parent */
+     * This is called by the parent or some other thread */
 #ifdef LISP_FEATURE_GENCGC
     gc_alloc_update_page_tables(0, &th->alloc_region);
 #endif
     get_spinlock(&all_threads_lock,th->pid);
-    th->state=STATE_STOPPED;
+    th->unbound_marker=0;      /* for debugging */
     if(th==all_threads) 
        all_threads=th->next;
     else {
@@ -255,7 +278,6 @@ void destroy_thread (struct thread *th)
                  32*SIGSTKSZ);
 }
 
-
 struct thread *find_thread_by_pid(pid_t pid) 
 {
     struct thread *th;
@@ -264,10 +286,54 @@ struct thread *find_thread_by_pid(pid_t pid)
     return 0;
 }
 
+#if defined LISP_FEATURE_SB_THREAD
+/* This is not needed unless #+SB-THREAD, as there's a trivial null
+ * unithread definition. */
+
+void mark_dead_threads() 
+{
+    pid_t kid;
+    int status;
+    while(1) {
+       kid=waitpid(-1,&status,__WALL|WNOHANG);
+       if(kid<=0) break;
+       if(WIFEXITED(status) || WIFSIGNALED(status)) {
+           struct thread *th=find_thread_by_pid(kid);
+           if(th) th->state=STATE_DEAD;
+       }
+    }
+}
+
+void reap_dead_threads() 
+{
+    struct thread *th,*next,*prev=0;
+    th=all_threads;
+    while(th) {
+       next=th->next;
+       if(th->state==STATE_DEAD) {
+           funcall1(SymbolFunction(HANDLE_THREAD_EXIT),make_fixnum(th->pid));
+#ifdef LISP_FEATURE_GENCGC
+           gc_alloc_update_page_tables(0, &th->alloc_region);
+#endif
+           get_spinlock(&all_threads_lock,th->pid);
+           if(prev) prev->next=next;
+           else all_threads=next;
+           release_spinlock(&all_threads_lock);
+           if(th->tls_cookie>=0) arch_os_thread_cleanup(th); 
+           os_invalidate((os_vm_address_t) th->control_stack_start,
+                         ((sizeof (lispobj))
+                          * (th->control_stack_end-th->control_stack_start)) +
+                         BINDING_STACK_SIZE+ALIEN_STACK_SIZE+dynamic_values_bytes+
+                         32*SIGSTKSZ);
+       } else 
+           prev=th;
+       th=next;
+    }
+}
+
 /* These are not needed unless #+SB-THREAD, and since sigwaitinfo()
  * doesn't seem to be easily available everywhere (OpenBSD...) it's
  * more trouble than it's worth to compile it when not needed. */
-#if defined LISP_FEATURE_SB_THREAD
 void block_sigcont(void)
 {
     /* don't allow ourselves to receive SIGCONT while we're in the
@@ -294,9 +360,12 @@ void unblock_sigcont_and_sleep(void)
 int interrupt_thread(pid_t pid, lispobj function)
 {
     union sigval sigval;
+    struct thread *th;
     sigval.sival_int=function;
-
-    return sigqueue(pid, SIG_INTERRUPT_THREAD, sigval);
+    for_each_thread(th) 
+       if((th->pid==pid) && (th->state != STATE_DEAD))
+           return sigqueue(pid, SIG_INTERRUPT_THREAD, sigval);
+    errno=EPERM; return -1;
 }
 
 int signal_thread_to_dequeue (pid_t pid)
@@ -306,7 +375,7 @@ int signal_thread_to_dequeue (pid_t pid)
 
 
 /* stopping the world is a two-stage process.  From this thread we signal 
- * all the others with SIG_STOP_FOR_GC.  The handler for this thread does
+ * all the others with SIG_STOP_FOR_GC.  The handler for this signal does
  * the usual pseudo-atomic checks (we don't want to stop a thread while 
  * it's in the middle of allocation) then kills _itself_ with SIGSTOP.
  */
@@ -316,26 +385,27 @@ void gc_stop_the_world()
     /* stop all other threads by sending them SIG_STOP_FOR_GC */
     struct thread *p,*th=arch_os_get_current_thread();
     pid_t old_pid;
-    int finished=0;
+    int finished;
     do {
-       get_spinlock(&all_threads_lock,th->pid);
+       finished=1;
        for(p=all_threads,old_pid=p->pid; p; p=p->next) {
            if(p==th) continue;
-           if(p->state!=STATE_RUNNING) continue;
-           p->state=STATE_STOPPING;
-           kill(p->pid,SIG_STOP_FOR_GC);
+           if(p->state==STATE_RUNNING) {
+               p->state=STATE_STOPPING;
+               if(kill(p->pid,SIG_STOP_FOR_GC)==-1) {
+                   /* we can't kill the process; assume because it
+                    * died already (and its parent is dead so never
+                    * saw the SIGCHLD) */
+                   p->state=STATE_DEAD;
+               }
+           }
+           if((p->state!=STATE_STOPPED) &&
+              (p->state!=STATE_DEAD)) {
+               finished=0;
+           }
        }
-       release_spinlock(&all_threads_lock);
-       sched_yield();
-       /* if everything has stopped, and there is no possibility that
-        * a new thread has been created, we're done.  Otherwise go
-        * round again and signal anything that sprang up since last
-        * time  */
-       if(old_pid==all_threads->pid) {
-           finished=1;
-           for_each_thread(p) 
-               finished = finished &&
-               ((p==th) || (p->state==STATE_STOPPED));
+       if(old_pid!=all_threads->pid) {
+           finished=0;
        }
     } while(!finished);
 }
@@ -343,12 +413,14 @@ void gc_stop_the_world()
 void gc_start_the_world()
 {
     struct thread *p,*th=arch_os_get_current_thread();
-    get_spinlock(&all_threads_lock,th->pid);
+    /* if a resumed thread creates a new thread before we're done with
+     * this loop, the new thread will get consed on the front of *
+     * all_threads_lock, but it won't have been stopped so won't need
+     * restarting */
     for(p=all_threads;p;p=p->next) {
-       if(p==th) continue;
+       if((p==th) || (p->state==STATE_DEAD)) continue;
        p->state=STATE_RUNNING;
-       kill(p->pid,SIGCONT);
+       kill(p->pid,SIG_STOP_FOR_GC);
     }
-    release_spinlock(&all_threads_lock);
 }
 #endif