0.9.6.1:

[sbcl.git] / src / runtime / dynbind.c

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 1c3a6ab..d9774d6 100644 (file)
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,14 +13,15 @@
  * files for more information.
  */
 
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #include "dynbind.h"
 #include "thread.h"
 #include "genesis/symbol.h"
 #include "genesis/binding.h"
 #include "genesis/thread.h"
+#include "genesis/static-symbols.h"
 
 #if defined(BINDING_STACK_POINTER)
 #define GetBSP() ((struct binding *)SymbolValue(BINDING_STACK_POINTER,thread))
@@ -32,25 +33,34 @@
 
 void bind_variable(lispobj symbol, lispobj value, void *th)
 {
-    lispobj old_tl_value;
     struct binding *binding;
     struct thread *thread=(struct thread *)th;
-#ifdef LISP_FEATURE_SB_THREAD
-    struct symbol *sym=(struct symbol *)native_pointer(symbol);
-#endif
     binding = GetBSP();
     SetBSP(binding+1);
 #ifdef LISP_FEATURE_SB_THREAD
-    if(!sym->tls_index) {
-       sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
-       SetSymbolValue(FREE_TLS_INDEX,
-                      make_fixnum(fixnum_value(sym->tls_index)+1),0);
+    {
+        struct symbol *sym=(struct symbol *)native_pointer(symbol);
+        if(!sym->tls_index) {
+            lispobj *tls_index_lock=
+                &((struct symbol *)native_pointer(TLS_INDEX_LOCK))->value;
+            SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0),th);
+            SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1),th);
+            get_spinlock(tls_index_lock,(long)th);
+            if(!sym->tls_index) {
+                sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
+                SetSymbolValue(FREE_TLS_INDEX,
+                               make_fixnum(fixnum_value(sym->tls_index)+1),0);
+            }
+            release_spinlock(tls_index_lock);
+            SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(0),th);
+            if (fixnum_value(SymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th)))
+                do_pending_interrupt();
+        }
     }
 #endif
-    old_tl_value=SymbolTlValue(symbol,thread);
-    binding->value = old_tl_value;
+    binding->value = SymbolTlValue(symbol, thread);
     binding->symbol = symbol;
-    SetTlSymbolValue(symbol, value,thread);
+    SetTlSymbolValue(symbol, value, thread);
 }
 
 void
@@ -59,9 +69,9 @@ unbind(void *th)
     struct thread *thread=(struct thread *)th;
     struct binding *binding;
     lispobj symbol;
-       
+
     binding = GetBSP() - 1;
-               
+
     symbol = binding->symbol;
 
     SetTlSymbolValue(symbol, binding->value,thread);
@@ -80,13 +90,13 @@ unbind_to_here(lispobj *bsp,void *th)
     lispobj symbol;
 
     while (target < binding) {
-       binding--;
+        binding--;
 
-       symbol = binding->symbol;
-       if (symbol) {
-           SetTlSymbolValue(symbol, binding->value,thread);
-           binding->symbol = 0;
-       }
+        symbol = binding->symbol;
+        if (symbol) {
+            SetTlSymbolValue(symbol, binding->value,thread);
+            binding->symbol = 0;
+        }
     }
     SetBSP(binding);
 }