X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=3de541546cd27488289bfa445510aff18dcaebf5;hb=9effe671fd4baacd924b58a25dac89587d38eb27;hp=d124437f0745e0d37ce3bcefefd3288b8f3dabcb;hpb=b6537fc9d37ad800f8faba89ebbde7fdf8910d2a;p=sbcl.git

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index d124437..3de5415 100644
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -8,7 +8,6 @@
 #include "globals.h"
 #include "runtime.h"
 #include "os.h"
-#include "interrupt.h"
 #ifdef LISP_FEATURE_GENCGC
 #include "gencgc-alloc-region.h"
 #else
@@ -17,11 +16,49 @@ struct alloc_region { };
 #include "genesis/symbol.h"
 #include "genesis/static-symbols.h"
 #include "genesis/thread.h"
+#include "genesis/fdefn.h"
+#include "interrupt.h"
 
 #define STATE_RUNNING (make_fixnum(1))
 #define STATE_SUSPENDED (make_fixnum(2))
 #define STATE_DEAD (make_fixnum(3))
 
+#ifdef LISP_FEATURE_SB_THREAD
+
+/* Only access thread state with blockables blocked. */
+static inline lispobj
+thread_state(struct thread *thread)
+{
+    lispobj state;
+    pthread_mutex_lock(thread->state_lock);
+    state = thread->state;
+    pthread_mutex_unlock(thread->state_lock);
+    return state;
+}
+
+static inline void
+set_thread_state(struct thread *thread, lispobj state)
+{
+    pthread_mutex_lock(thread->state_lock);
+    thread->state = state;
+    pthread_cond_broadcast(thread->state_cond);
+    pthread_mutex_unlock(thread->state_lock);
+}
+
+static inline void
+wait_for_thread_state_change(struct thread *thread, lispobj state)
+{
+    pthread_mutex_lock(thread->state_lock);
+    while (thread->state == state)
+        pthread_cond_wait(thread->state_cond, thread->state_lock);
+    pthread_mutex_unlock(thread->state_lock);
+}
+
+extern pthread_key_t lisp_thread;
+#endif
+
+extern int kill_safely(os_thread_t os_thread, int signal);
+
 #define THREAD_SLOT_OFFSET_WORDS(c) \
  (offsetof(struct thread,c)/(sizeof (struct thread *)))
 
@@ -30,9 +67,18 @@ union per_thread_data {
     lispobj dynamic_values[1];  /* actually more like 4000 or so */
 };
 
-extern struct thread * volatile all_threads;
+extern struct thread *all_threads;
 extern int dynamic_values_bytes;
 
+#if defined(LISP_FEATURE_DARWIN)
+#define CONTROL_STACK_ALIGNMENT_BYTES 8192 /* darwin wants page-aligned stacks */
+#define THREAD_ALIGNMENT_BYTES CONTROL_STACK_ALIGNMENT_BYTES
+#else
+#define THREAD_ALIGNMENT_BYTES BACKEND_PAGE_BYTES
+#define CONTROL_STACK_ALIGNMENT_BYTES 16
+#endif
+
+
 #ifdef LISP_FEATURE_SB_THREAD
 #define for_each_thread(th) for(th=all_threads;th;th=th->next)
 #else
@@ -41,8 +87,24 @@ extern int dynamic_values_bytes;
 #define for_each_thread(th) for(th=all_threads;th;th=0)
 #endif
 
+static inline lispobj *
+SymbolValueAddress(u64 tagged_symbol_pointer, void *thread)
+{
+    struct symbol *sym= (struct symbol *)
+        (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+#ifdef LISP_FEATURE_SB_THREAD
+    if(thread && sym->tls_index) {
+        lispobj *r = &(((union per_thread_data *)thread)
+                       ->dynamic_values[fixnum_value(sym->tls_index)]);
+        if((*r)!=NO_TLS_VALUE_MARKER_WIDETAG) return r;
+    }
+#endif
+    return &sym->value;
+}
+
 static inline lispobj
-SymbolValue(u64 tagged_symbol_pointer, void *thread) {
+SymbolValue(u64 tagged_symbol_pointer, void *thread)
+{
     struct symbol *sym= (struct symbol *)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
@@ -57,7 +119,8 @@ SymbolValue(u64 tagged_symbol_pointer, void *thread) {
 }
 
 static inline lispobj
-SymbolTlValue(u64 tagged_symbol_pointer, void *thread) {
+SymbolTlValue(u64 tagged_symbol_pointer, void *thread)
+{
     struct symbol *sym= (struct symbol *)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
@@ -69,7 +132,8 @@ SymbolTlValue(u64 tagged_symbol_pointer, void *thread) {
 }
 
 static inline void
-SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
+SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread)
+{
     struct symbol *sym= (struct symbol *)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
@@ -84,8 +148,10 @@ SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
 #endif
     sym->value = val;
 }
+
 static inline void
-SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
+SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread)
+{
 #ifdef LISP_FEATURE_SB_THREAD
     struct symbol *sym= (struct symbol *)
         (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
@@ -97,19 +163,55 @@ SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
 #endif
 }
 
-static inline
-os_context_t *get_interrupt_context_for_thread(struct thread *th)
+/* This only works for static symbols. */
+static inline lispobj
+StaticSymbolFunction(lispobj sym)
 {
-    return th->interrupt_contexts
-        [fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,th)-1)];
+    return ((struct fdefn *)native_pointer(SymbolValue(sym, 0)))->fun;
 }
 
+/* These are for use during GC, on the current thread, or on prenatal
+ * threads only. */
+#if defined(LISP_FEATURE_SB_THREAD)
+#define get_binding_stack_pointer(thread)       \
+    ((thread)->binding_stack_pointer)
+#define set_binding_stack_pointer(thread,value) \
+    ((thread)->binding_stack_pointer = (lispobj *)(value))
+#define access_control_stack_pointer(thread) \
+    ((thread)->control_stack_pointer)
+#  if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
+#define access_control_frame_pointer(thread) \
+    ((thread)->control_frame_pointer)
+#  endif
+#elif defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+#define get_binding_stack_pointer(thread)       \
+    SymbolValue(BINDING_STACK_POINTER, thread)
+#define set_binding_stack_pointer(thread,value) \
+    SetSymbolValue(BINDING_STACK_POINTER, (lispobj)(value), thread)
+#define access_control_stack_pointer(thread)    \
+    (current_control_stack_pointer)
+#else
+#define get_binding_stack_pointer(thread)       \
+    (current_binding_stack_pointer)
+#define set_binding_stack_pointer(thread,value) \
+    (current_binding_stack_pointer = (lispobj *)(value))
+#define access_control_stack_pointer(thread) \
+    (current_control_stack_pointer)
+#define access_control_frame_pointer(thread) \
+    (current_control_frame_pointer)
+#endif
+
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_GCC_TLS)
+extern __thread struct thread *current_thread;
+#endif
+
 /* This is clearly per-arch and possibly even per-OS code, but we can't
  * put it somewhere sensible like x86-linux-os.c because it needs too
  * much stuff like struct thread and all_threads to be defined, which
  * usually aren't by that time.  So, it's here instead.  Sorry */
 
-static inline struct thread *arch_os_get_current_thread() {
+static inline struct thread *arch_os_get_current_thread(void)
+{
 #if defined(LISP_FEATURE_SB_THREAD)
 #if defined(LISP_FEATURE_X86)
     register struct thread *me=0;
@@ -121,8 +223,13 @@ static inline struct thread *arch_os_get_current_thread() {
         sel.rpl = USER_PRIV;
         sel.ti = SEL_LDT;
         __asm__ __volatile__ ("movw %w0, %%fs" : : "r"(sel));
-#elif defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_TLS)
+#elif defined(LISP_FEATURE_FREEBSD)
+#ifdef LISP_FEATURE_GCC_TLS
+        struct thread *th = current_thread;
+#else
         struct thread *th = pthread_getspecific(specials);
+#endif
+#ifdef LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_TLS
         unsigned int sel = LSEL(th->tls_cookie, SEL_UPL);
         unsigned int fs = rfs();
 
@@ -130,6 +237,7 @@ static inline struct thread *arch_os_get_current_thread() {
          * causes privilege checking and it takes long time. */
         if (fs != sel)
             load_fs(sel);
+#endif
         return th;
 #endif
         __asm__ __volatile__ ("movl %%fs:%c1,%0" : "=r" (me)
@@ -137,28 +245,22 @@ static inline struct thread *arch_os_get_current_thread() {
     }
     return me;
 #else
+#ifdef LISP_FEATURE_GCC_TLS
+    return current_thread;
+#else
     return pthread_getspecific(specials);
+#endif
 #endif /* x86 */
 #else
      return all_threads;
 #endif
 }
 
-#if defined(LISP_FEATURE_SB_THREAD)
-#define thread_self pthread_self
-#define thread_kill pthread_kill
-#define thread_sigmask pthread_sigmask
-#define thread_mutex_lock(l) pthread_mutex_lock(l)
-#define thread_mutex_unlock(l) pthread_mutex_unlock(l)
-#else
-#define thread_self getpid
-#define thread_kill kill
-#define thread_sigmask sigprocmask
-#define thread_mutex_lock(l) 0
-#define thread_mutex_unlock(l) 0
+#if defined(LISP_FEATURE_MACH_EXCEPTION_HANDLER)
+#define THREAD_STRUCT_TO_EXCEPTION_PORT(th) ((mach_port_t) th)
+#define EXCEPTION_PORT_TO_THREAD_STRUCT(th) ((struct thread *) th)
 #endif
 
 extern void create_initial_thread(lispobj);
-extern int kill_thread_safely(os_thread_t os_thread, int signo);
 
 #endif /* _INCLUDE_THREAD_H_ */