1.0.9.62: Performance and stability improvement of threading on FreeBSD

[sbcl.git] / src / runtime / thread.h

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index 2815abd..ca50539 100644 (file)
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -18,7 +18,6 @@ struct alloc_region { };
 #include "genesis/static-symbols.h"
 #include "genesis/thread.h"
 
-#define STATE_STARTING (make_fixnum(0))
 #define STATE_RUNNING (make_fixnum(1))
 #define STATE_SUSPENDED (make_fixnum(2))
 #define STATE_DEAD (make_fixnum(3))
@@ -43,7 +42,8 @@ extern int dynamic_values_bytes;
 #endif
 
 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
@@ -58,7 +58,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
@@ -70,7 +71,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
@@ -85,8 +87,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);
@@ -105,27 +109,66 @@ os_context_t *get_interrupt_context_for_thread(struct thread *th)
         [fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,th)-1)];
 }
 
+#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;
-    if(all_threads)
+    if(all_threads) {
+#if defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_RESTORE_FS_SEGMENT_REGISTER_FROM_TLS)
+        sel_t sel;
+        struct thread *th = pthread_getspecific(specials);
+        sel.index = th->tls_cookie;
+        sel.rpl = USER_PRIV;
+        sel.ti = SEL_LDT;
+        __asm__ __volatile__ ("movw %w0, %%fs" : : "r"(sel));
+#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();
+
+        /* Load FS only if it's necessary.  Modifying a selector
+         * 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)
                  : "i" (offsetof (struct thread,this)));
+    }
     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_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
+
 #if defined(LISP_FEATURE_SB_THREAD)
 #define thread_self pthread_self
 #define thread_kill pthread_kill
@@ -136,10 +179,11 @@ static inline struct thread *arch_os_get_current_thread() {
 #define thread_self getpid
 #define thread_kill kill
 #define thread_sigmask sigprocmask
-#define thread_mutex_lock(l)
-#define thread_mutex_unlock(l)
+#define thread_mutex_lock(l) 0
+#define thread_mutex_unlock(l) 0
 #endif
 
 extern void create_initial_thread(lispobj);
+extern int kill_thread_safely(os_thread_t os_thread, int signo);
 
 #endif /* _INCLUDE_THREAD_H_ */