X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=b8b99d3c07fd29b8c89b618eaa420a47e41976af;hb=7be8d1462a207bda809cd7553c5d76c6ebc4dda2;hp=fa4b7bc40c1ff5b0fec61224c607c0ae3d47ff88;hpb=1d329efe312141d5385af1d2e98f72f938b5f7b6;p=sbcl.git diff --git a/src/runtime/thread.h b/src/runtime/thread.h index fa4b7bc..b8b99d3 100644 --- a/src/runtime/thread.h +++ b/src/runtime/thread.h @@ -10,50 +10,22 @@ #include "os.h" #ifdef LISP_FEATURE_GENCGC #include "gencgc-alloc-region.h" -#else -struct alloc_region { }; #endif #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)) +#define STATE_RUNNING MAKE_FIXNUM(1) +#define STATE_STOPPED 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); -} - +lispobj thread_state(struct thread *thread); +void set_thread_state(struct thread *thread, lispobj state); +void wait_for_thread_state_change(struct thread *thread, lispobj state); extern pthread_key_t lisp_thread; #endif @@ -95,7 +67,7 @@ SymbolValueAddress(u64 tagged_symbol_pointer, void *thread) #ifdef LISP_FEATURE_SB_THREAD if(thread && sym->tls_index) { lispobj *r = &(((union per_thread_data *)thread) - ->dynamic_values[fixnum_value(sym->tls_index)]); + ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]); if((*r)!=NO_TLS_VALUE_MARKER_WIDETAG) return r; } #endif @@ -111,7 +83,7 @@ SymbolValue(u64 tagged_symbol_pointer, void *thread) if(thread && sym->tls_index) { lispobj r= ((union per_thread_data *)thread) - ->dynamic_values[fixnum_value(sym->tls_index)]; + ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]; if(r!=NO_TLS_VALUE_MARKER_WIDETAG) return r; } #endif @@ -125,7 +97,7 @@ SymbolTlValue(u64 tagged_symbol_pointer, void *thread) (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)]; + ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]; #else return sym->value; #endif @@ -139,7 +111,7 @@ SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) #ifdef LISP_FEATURE_SB_THREAD if(thread && sym->tls_index) { lispobj *pr= &(((union per_thread_data *)thread) - ->dynamic_values[fixnum_value(sym->tls_index)]); + ->dynamic_values[(sym->tls_index) >> WORD_SHIFT]); if(*pr!=NO_TLS_VALUE_MARKER_WIDETAG) { *pr=val; return; @@ -156,7 +128,7 @@ SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) struct symbol *sym= (struct symbol *) (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG); ((union per_thread_data *)thread) - ->dynamic_values[fixnum_value(sym->tls_index)] + ->dynamic_values[(sym->tls_index) >> WORD_SHIFT] =val; #else SetSymbolValue(tagged_symbol_pointer,val,thread) ; @@ -177,16 +149,28 @@ StaticSymbolFunction(lispobj sym) ((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)