X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=78367d4163d1bc2343b1d35d03e0d147d2a31566;hb=d4d6c4b16a3655ce99a87d43f411391363531260;hp=3f823ccf520be23b1e8df680871547819a7cdef1;hpb=c580293e8550414004697173f7e2c2b6bdf81070;p=sbcl.git diff --git a/src/runtime/thread.h b/src/runtime/thread.h index 3f823cc..78367d4 100644 --- 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)) @@ -42,7 +41,8 @@ extern int dynamic_values_bytes; #define for_each_thread(th) for(th=all_threads;th;th=0) #endif -static inline lispobj SymbolValue(u64 tagged_symbol_pointer, void *thread) { +static inline lispobj +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 @@ -55,7 +55,9 @@ static inline lispobj SymbolValue(u64 tagged_symbol_pointer, void *thread) { #endif return sym->value; } -static inline lispobj SymbolTlValue(u64 tagged_symbol_pointer, void *thread) { + +static inline lispobj +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 @@ -66,7 +68,8 @@ static inline lispobj SymbolTlValue(u64 tagged_symbol_pointer, void *thread) { #endif } -static inline void SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) { +static inline void +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 @@ -81,7 +84,8 @@ static inline void SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *t #endif sym->value = val; } -static inline void SetTlSymbolValue(u64 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 *) (pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG); @@ -93,7 +97,8 @@ static inline void SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void #endif } -static inline os_context_t *get_interrupt_context_for_thread(struct thread *th) +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)]; @@ -124,10 +129,14 @@ static inline struct thread *arch_os_get_current_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) +#define thread_mutex_unlock(l) #endif extern void create_initial_thread(lispobj);