Don't block when locking finalizer list mutex.

rubinius · Jun 9, 2016 · b3f1724 · b3f1724
1 parent 3f7bc1e
commit b3f1724
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/machine/memory/finalizer.cpp b/machine/memory/finalizer.cpp
@@ -175,7 +175,7 @@ namespace rubinius {
       MachineThread::wakeup(state);
 
       while(thread_running_) {
-        std::lock_guard<std::mutex> guard(list_mutex());
+        LockWaiting<std::mutex> guard(state, list_mutex());
         list_condition().notify_one();
       }
     }
@@ -253,7 +253,7 @@ namespace rubinius {
       if(finishing_) return;
 
       {
-        std::lock_guard<std::mutex> guard(list_mutex());
+        LockWaiting<std::mutex> guard(state, list_mutex());
 
         for(FinalizerObjects::iterator i = live_list_.begin();
             i != live_list_.end();
@@ -300,7 +300,7 @@ namespace rubinius {
     }
 
     void FinalizerThread::add_finalizer(STATE, FinalizerObject* obj) {
-      std::lock_guard<std::mutex> guard(list_mutex());
+      LockWaiting<std::mutex> guard(state, list_mutex());
 
       live_list_.push_back(obj);
       vm()->metrics().gc.objects_queued++;

diff --git a/machine/thread_phase.hpp b/machine/thread_phase.hpp
@@ -76,26 +76,24 @@ namespace rubinius {
     }
   };
 
-  template <class T>
-  class LockWaiting : public utilities::thread::LockGuardTemplate<T> {
-    State* state_;
-    ThreadNexus::Phase phase_;
+  template <typename T>
+  class LockWaiting {
+    T& lock_;
 
   public:
     LockWaiting(STATE, T& in_lock)
-      : utilities::thread::LockGuardTemplate<T>(in_lock, false)
-      , state_(state)
+      : lock_(in_lock)
     {
-      phase_ = state_->vm()->thread_phase();
-      state_->vm()->thread_nexus()->waiting_phase(state_->vm());
+      ThreadNexus::Phase phase = state->vm()->thread_phase();
+      state->vm()->thread_nexus()->waiting_phase(state->vm());
 
-      this->lock();
+      lock_.lock();
 
-      state_->vm()->thread_nexus()->restore_phase(state_->vm(), phase_);
+      state->vm()->thread_nexus()->restore_phase(state->vm(), phase);
     }
 
     ~LockWaiting() {
-      this->unlock();
+      lock_.unlock();
     }
   };