X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fthread.h;h=f8ec4e71b67822d9ab64351aa62924bb60c9bdae;hb=409fcc671231b594ec010adf683f72a871ec1d6a;hp=cf13ac95bacc9af619ca7a252aef1e32383bfd40;hpb=ce027af4a3f623440d33e7be119fe46caaecee65;p=sbcl.git

diff --git a/src/runtime/thread.h b/src/runtime/thread.h
index cf13ac9..f8ec4e7 100644
--- a/src/runtime/thread.h
+++ b/src/runtime/thread.h
@@ -23,6 +23,39 @@ struct alloc_region { };
 #define STATE_SUSPENDED (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);
+}
+
+#endif
+
 #define THREAD_SLOT_OFFSET_WORDS(c) \
  (offsetof(struct thread,c)/(sizeof (struct thread *)))
 
@@ -31,7 +64,7 @@ union per_thread_data {
     lispobj dynamic_values[1];  /* actually more like 4000 or so */
 };
 
-extern struct thread * volatile all_threads;
+extern struct thread *all_threads;
 extern int dynamic_values_bytes;
 
 #if defined(LISP_FEATURE_DARWIN)
@@ -51,6 +84,21 @@ extern int dynamic_values_bytes;
 #define for_each_thread(th) for(th=all_threads;th;th=0)
 #endif
 
+static inline lispobj *
+SymbolValueAddress(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
+    if(thread && sym->tls_index) {
+        lispobj *r = &(((union per_thread_data *)thread)
+                       ->dynamic_values[fixnum_value(sym->tls_index)]);
+        if((*r)!=NO_TLS_VALUE_MARKER_WIDETAG) return r;
+    }
+#endif
+    return &sym->value;
+}
+
 static inline lispobj
 SymbolValue(u64 tagged_symbol_pointer, void *thread)
 {