Fixed canceling Metrics timer on FreeBSD.

rubinius · Jan 21, 2015 · 6d1c999 · 6d1c999
1 parent 178174a
commit 6d1c999
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/vm/console.cpp b/vm/console.cpp
@@ -59,6 +59,8 @@ namespace rubinius {
       , response_fd_(-1)
       , request_exit_(false)
       , response_exit_(false)
+      , request_running_(false)
+      , response_running_(false)
       , request_list_(NULL)
     {
       shared_.auxiliary_threads()->register_thread(this);
@@ -112,6 +114,9 @@ namespace rubinius {
       request_exit_ = false;
       response_exit_ = false;
 
+      request_running_ = false;
+      response_running_ = false;
+
       list_lock_.init();
       response_lock_.init();
       response_cond_.init();

diff --git a/vm/metrics.cpp b/vm/metrics.cpp
@@ -193,6 +193,7 @@ namespace rubinius {
       , shared_(state->shared())
       , vm_(NULL)
       , thread_exit_(false)
+      , thread_running_(false)
       , thread_(state)
       , values_(state)
       , interval_(state->shared().config.system_metrics_interval)
@@ -419,6 +420,7 @@ namespace rubinius {
     void Metrics::start(STATE) {
       vm_ = NULL;
       thread_exit_ = false;
+      thread_running_ = false;
 
       timer_ = new timer::Timer;
 
@@ -433,7 +435,10 @@ namespace rubinius {
 
       atomic::memory_barrier();
 
-      if(timer_) timer_->cancel();
+      if(timer_) {
+        timer_->clear();
+        timer_->cancel();
+      }
     }
 
     void Metrics::start_thread(STATE) {
@@ -456,10 +461,11 @@ namespace rubinius {
       if(vm_) {
         wakeup();
 
-        pthread_t os = vm_->os_thread();
-
-        void* return_value;
-        pthread_join(os, &return_value);
+        if(atomic::poll(thread_running_, false)) {
+          void* return_value;
+          pthread_t os = vm_->os_thread();
+          pthread_join(os, &return_value);
+        }
 
         vm_ = NULL;
       }
@@ -492,6 +498,8 @@ namespace rubinius {
       RUBINIUS_THREAD_START(const_cast<RBX_DTRACE_CHAR_P>(thread_name),
                             state->vm()->thread_id(), 1);
 
+      thread_running_ = true;
+
       state->vm()->thread->hard_unlock(state, gct, 0);
       state->gc_dependent(gct, 0);
 
@@ -549,6 +557,8 @@ namespace rubinius {
 
       timer_->clear();
 
+      thread_running_ = false;
+
       RUBINIUS_THREAD_STOP(const_cast<RBX_DTRACE_CHAR_P>(thread_name),
                            state->vm()->thread_id(), 1);
     }

diff --git a/vm/metrics.hpp b/vm/metrics.hpp
@@ -380,6 +380,7 @@ namespace rubinius {
       SharedState& shared_;
       VM* vm_;
       bool thread_exit_;
+      bool thread_running_;
 
       TypedRoot<Thread*> thread_;
       TypedRoot<Tuple*> values_;