Remove threads from list when they finish executing.

brixen · brixen · commit 1d60cbe33359 · 2015-07-09T16:35:43.000-07:00
diff --git a/vm/builtin/thread.cpp b/vm/builtin/thread.cpp
@@ -329,7 +329,7 @@ namespace rubinius {
 
     shared.gc_independent();
 
-    vm->set_zombie();
+    vm->set_zombie(state);
 
     RUBINIUS_THREAD_STOP(
         const_cast<RBX_DTRACE_CHAR_P>(vm->name().c_str()), vm->thread_id(), 0);
diff --git a/vm/internal_threads.cpp b/vm/internal_threads.cpp
@@ -39,6 +39,7 @@ namespace rubinius {
 
     thread->run(state);
 
+    vm->set_call_frame(0);
     thread->thread_running_ = false;
 
     NativeMethod::cleanup_thread(state);
@@ -48,6 +49,8 @@ namespace rubinius {
 
     shared.gc_independent();
 
+    vm->set_zombie(state);
+
     return 0;
   }
 
diff --git a/vm/vm.cpp b/vm/vm.cpp
@@ -107,14 +107,14 @@ namespace rubinius {
 
   void VM::discard(STATE, VM* vm) {
     vm->saved_call_frame_ = 0;
-    vm->shared.remove_vm(vm);
 
     state->vm()->metrics().system.threads_destroyed++;
 
     delete vm;
   }
 
-  void VM::set_zombie() {
+  void VM::set_zombie(STATE) {
+    state->shared().remove_vm(this);
     thread.set(nil<Thread>());
     zombie_ = true;
   }
diff --git a/vm/vm.hpp b/vm/vm.hpp
@@ -154,7 +154,7 @@ namespace rubinius {
       return interrupt_lock_;
     }
 
-    void set_zombie();
+    void set_zombie(STATE);
 
     bool zombie_p() {
       return zombie_;

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,14 @@ namespace rubinius {`
`107`	`107`
`108`	`108`	`void VM::discard(STATE, VM* vm) {`
`109`	`109`	`vm->saved_call_frame_ = 0;`
`110`		`- vm->shared.remove_vm(vm);`
`111`	`110`
`112`	`111`	`state->vm()->metrics().system.threads_destroyed++;`
`113`	`112`
`114`	`113`	`delete vm;`
`115`	`114`	`}`
`116`	`115`
`117`		`- void VM::set_zombie() {`
	`116`	`+ void VM::set_zombie(STATE) {`
	`117`	`+ state->shared().remove_vm(this);`
`118`	`118`	`thread.set(nil<Thread>());`
`119`	`119`	`zombie_ = true;`
`120`	`120`	`}`