Ensure to unlock the thread object when running thread

rubinius · Oct 24, 2012 · 88402f1 · 88402f1
1 parent fcaf1f9
commit 88402f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/vm/objectmemory.cpp b/vm/objectmemory.cpp
@@ -974,6 +974,9 @@ namespace rubinius {
     CallFrame* call_frame = 0;
     utilities::thread::Thread::set_os_name("rbx.finalizer");
 
+    GCTokenImpl gct;
+    state->vm()->thread->hard_unlock(state, gct);
+
     // Forever
     for(;;) {
       FinalizeObject* fi;
@@ -1028,8 +1031,6 @@ namespace rubinius {
       fi->status = FinalizeObject::eFinalized;
     }
 
-    GCTokenImpl gct;
-
     state->checkpoint(gct, 0);
   }
 

diff --git a/vm/signal.cpp b/vm/signal.cpp
@@ -143,6 +143,8 @@ namespace rubinius {
     GCTokenImpl gct;
     utilities::thread::Thread::set_os_name("rbx.signal-dispatch");
 
+    state->vm()->thread->hard_unlock(state, gct);
+
     for(;;) {
       fd_set fds;
       FD_ZERO(&fds);