X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fthread.h;h=e1cabcd3f6a3caf5bcae1cc6d1ad11a1b655ed17;hb=3fe0010d2777b41e01ea9b4a0f894cfa40f7df1b;hp=948b6b693f48ae177b9d3d5be4ccef783bbe6496;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index 948b6b6..e1cabcd 100644
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -1,22 +1,28 @@
-
 #if !defined(_INCLUDE_THREAD_H_)
 #define _INCLUDE_THREAD_H_
 
 #include <sys/types.h>
 #include <unistd.h>
-#include "runtime.h"
+#include <stddef.h>
 #include "sbcl.h"
+#include "globals.h"
+#include "runtime.h"
 #include "os.h"
 #include "interrupt.h"
 #ifdef LISP_FEATURE_GENCGC
 #include "gencgc-alloc-region.h"
 #else
-#error "threading doesn't work with cheney gc yet"
+struct alloc_region { };
 #endif
 #include "genesis/symbol.h"
 #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))
+
 #define THREAD_SLOT_OFFSET_WORDS(c) \
  (offsetof(struct thread,c)/(sizeof (struct thread *)))
 
@@ -27,7 +33,6 @@ union per_thread_data {
 
 extern struct thread *all_threads;
 extern int dynamic_values_bytes;
-extern struct thread *find_thread_by_pid(pid_t pid);
 
 #ifdef LISP_FEATURE_SB_THREAD
 #define for_each_thread(th) for(th=all_threads;th;th=th->next)
@@ -37,9 +42,9 @@ extern struct thread *find_thread_by_pid(pid_t pid);
 #define for_each_thread(th) for(th=all_threads;th;th=0)
 #endif
 
-static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolValue(u64 tagged_symbol_pointer, void *thread) {
     struct symbol *sym= (struct symbol *)
-	(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+	(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
 	lispobj r=
@@ -50,9 +55,9 @@ static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
 #endif
     return sym->value;
 }
-static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolTlValue(u64 tagged_symbol_pointer, void *thread) {
     struct symbol *sym= (struct symbol *)
-	(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+	(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     return ((union per_thread_data *)thread)
 	->dynamic_values[fixnum_value(sym->tls_index)];
@@ -61,9 +66,9 @@ static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
 #endif
 }
 
-static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
     struct symbol *sym=	(struct symbol *)
-	(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+	(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
 #ifdef LISP_FEATURE_SB_THREAD
     if(thread && sym->tls_index) {
 	lispobj *pr= &(((union per_thread_data *)thread)
@@ -76,10 +81,10 @@ static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *t
 #endif
     sym->value = val;
 }
-static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
 #ifdef LISP_FEATURE_SB_THREAD
     struct symbol *sym=	(struct symbol *)
-	(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
+	(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
     ((union per_thread_data *)thread)
 	->dynamic_values[fixnum_value(sym->tls_index)]
 	=val;
@@ -88,6 +93,43 @@ static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void
 #endif
 }
 
-    
+static inline os_context_t *get_interrupt_context_for_thread(struct thread *th)
+{
+    return th->interrupt_contexts
+	[fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,th)-1)];
+}
+
+/* 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() {
+#if defined(LISP_FEATURE_SB_THREAD)
+#if defined(LISP_FEATURE_X86)
+    register struct thread *me=0;
+    if(all_threads)
+	__asm__ __volatile__ ("movl %%fs:%c1,%0" : "=r" (me)
+		 : "i" (offsetof (struct thread,this)));
+    return me;
+#else
+    return pthread_getspecific(specials);
+#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
+#else
+#define thread_self getpid
+#define thread_kill kill
+#define thread_sigmask sigprocmask
+#endif
+
+extern void create_initial_thread(lispobj);
 
 #endif /* _INCLUDE_THREAD_H_ */