Block GC while creating Thread/Fiber structures.

rubinius · Jun 21, 2016 · b141c77 · b141c77
1 parent 14e9e54
commit b141c77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/machine/builtin/fiber.cpp b/machine/builtin/fiber.cpp
@@ -236,7 +236,11 @@ namespace rubinius {
     std::ostringstream name;
     name << "fiber." << fiber->fiber_id()->to_native();
 
-    fiber->vm(state->vm()->thread_nexus()->new_vm(&state->shared(), name.str().c_str()));
+    {
+      BlockPhase blocking(state);
+      fiber->vm(state->vm()->thread_nexus()->new_vm(&state->shared(), name.str().c_str()));
+    }
+
     fiber->vm()->set_kind(memory::ManagedThread::eFiber);
     fiber->vm()->set_suspending();
 

diff --git a/machine/builtin/thread.cpp b/machine/builtin/thread.cpp
@@ -87,9 +87,11 @@ namespace rubinius {
   }
 
   Thread* Thread::create(STATE, Object* self, ThreadFunction function) {
-    VM* vm = state->shared().thread_nexus()->new_vm(&state->shared());
+    BlockPhase blocking(state);
 
-    return Thread::create(state, self, vm, function);
+    return Thread::create(state, self,
+        state->shared().thread_nexus()->new_vm(&state->shared()),
+        function);
   }
 
   Thread* Thread::create(STATE, Object* self, VM* vm, ThreadFunction function) {