Make Console request thread GC dependent at exit.

rubinius · Oct 3, 2014 · 6c8237f · 6c8237f
1 parent 6580094
commit 6c8237f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/vm/console.cpp b/vm/console.cpp
@@ -312,6 +312,8 @@ namespace rubinius {
         }
       }
 
+      state->gc_dependent(gct, 0);
+
       RUBINIUS_THREAD_STOP(const_cast<RBX_DTRACE_CONST char*>(thread_name),
                            state->vm()->thread_id(), 1);
     }
@@ -357,7 +359,6 @@ namespace rubinius {
       while(!response_exit_) {
         {
           utilities::thread::Mutex::LockGuard lg(list_lock_);
-          GCIndependent guard(state, 0);
 
           if(request_list_->size() > 0) {
             request = request_list_->back();
@@ -386,6 +387,9 @@ namespace rubinius {
           utilities::thread::Mutex::LockGuard lg(response_lock_);
           GCIndependent guard(state, 0);
 
+          atomic::memory_barrier();
+          if(response_exit_) break;
+
           response_cond_.wait(response_lock_);
         }
       }