Fixed race checking fiber status.

rubinius · Jun 20, 2016 · 50a8915 · 50a8915
1 parent a1df78d
commit 50a8915
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/machine/builtin/fiber.cpp b/machine/builtin/fiber.cpp
@@ -74,13 +74,13 @@ namespace rubinius {
   }
 
   void Fiber::restart(STATE) {
-    if(!vm()->suspended_p()) {
-      Exception::raise_fiber_error(state, "attempt to restart non-suspended fiber");
-    }
-
     {
       std::lock_guard<std::mutex> guard(state->vm()->thread()->fiber_mutex());
 
+      if(!vm()->suspended_p()) {
+        Exception::raise_fiber_error(state, "attempt to restart non-suspended fiber");
+      }
+
       while(vm()->suspended_p()) {
         std::lock_guard<std::mutex> guard(vm()->wait_mutex());
         vm()->wait_condition().notify_one();
@@ -93,7 +93,10 @@ namespace rubinius {
       ; // spin wait
     }
 
-    state->vm()->thread()->current_fiber(state, this);
+    {
+      std::lock_guard<std::mutex> guard(state->vm()->thread()->fiber_mutex());
+      state->vm()->thread()->current_fiber(state, this);
+    }
   }
 
   void Fiber::suspend(STATE) {