X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=eb653c12d8e83b57e9bdf1705100939d6d66709b;hb=b429c5c0557ed790e84dae4d6c35e06ab1a14416;hp=f8ec4e71b67822d9ab64351aa62924bb60c9bdae;hpb=409fcc671231b594ec010adf683f72a871ec1d6a;p=sbcl.git diff --git a/src/runtime/thread.h b/src/runtime/thread.h index f8ec4e7..eb653c1 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 @@ -18,6 +17,7 @@ struct alloc_region { }; #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)) @@ -54,8 +54,11 @@ wait_for_thread_state_change(struct thread *thread, lispobj state) 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 *))) @@ -167,13 +170,6 @@ StaticSymbolFunction(lispobj sym) return ((struct fdefn *)native_pointer(SymbolValue(sym, 0)))->fun; } -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)]; -} - #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_GCC_TLS) extern __thread struct thread *current_thread; #endif @@ -235,6 +231,5 @@ static inline struct thread *arch_os_get_current_thread(void) #endif extern void create_initial_thread(lispobj); -extern int kill_thread_safely(os_thread_t os_thread, int signo); #endif /* _INCLUDE_THREAD_H_ */