X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=9a64a0ab25a0666d2cf43e55b9851c71aa78b1ba;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=d9774d620925077cc4d924dcb866244c6447a3aa;hpb=077b294463eb6819c0eba67bb8ce71ec66d61ba8;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index d9774d6..9a64a0a 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -13,11 +13,15 @@
  * files for more information.
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "sbcl.h"
 #include "runtime.h"
 #include "globals.h"
 #include "dynbind.h"
 #include "thread.h"
+#include "pseudo-atomic.h"
 #include "genesis/symbol.h"
 #include "genesis/binding.h"
 #include "genesis/thread.h"
@@ -43,17 +47,21 @@ void bind_variable(lispobj symbol, lispobj value, void *th)
         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);
+            FSHOW_SIGNAL((stderr, "entering dynbind tls alloc\n"));
+            set_pseudo_atomic_atomic(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);
+                if(fixnum_value(sym->tls_index)>=TLS_SIZE) {
+                    lose("Thread local storage exhausted.");
+                }
             }
             release_spinlock(tls_index_lock);
-            SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(0),th);
-            if (fixnum_value(SymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th)))
+            FSHOW_SIGNAL((stderr, "exiting dynbind tls alloc\n"));
+            clear_pseudo_atomic_atomic(th);
+            if (get_pseudo_atomic_interrupted(th))
                 do_pending_interrupt();
         }
     }
@@ -77,6 +85,7 @@ unbind(void *th)
     SetTlSymbolValue(symbol, binding->value,thread);
 
     binding->symbol = 0;
+    binding->value = 0;
 
     SetBSP(binding);
 }
@@ -94,8 +103,11 @@ unbind_to_here(lispobj *bsp,void *th)
 
         symbol = binding->symbol;
         if (symbol) {
-            SetTlSymbolValue(symbol, binding->value,thread);
+            if (symbol != UNBOUND_MARKER_WIDETAG) {
+                SetTlSymbolValue(symbol, binding->value,thread);
+            }
             binding->symbol = 0;
+            binding->value = 0;
         }
     }
     SetBSP(binding);