Completely remove InterruptableThreadState and Fix ThreadRegistry leak

runtime/vm/isolate.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "vm/code_observers.h"
@@ skipping 1748 matching lines @@
     // Paused at breakpoint. Don't tick.
     return 0;
   }
   MessageHandler* msg_handler = message_handler();
   if ((msg_handler != NULL) &&
       (msg_handler->paused_on_start() ||
        msg_handler->paused_on_exit())) {
     // Paused at start / exit . Don't tick.
     return 0;
   }
-  InterruptableThreadState* state = thread_state();
-  if (state == NULL) {
-    // Isolate is not scheduled on a thread.
+  if (mutator_thread_ == NULL) {
+    // No active mutator.
     ProfileIdle();
     return 1;
   }
-  ASSERT(state->id != OSThread::kInvalidThreadId);
-  ThreadInterrupter::InterruptThread(state);
+
+  // TODO(johnmccutchan): Sample all threads, not just the mutator thread.

[Ivan Posva, 2015/08/20 18:00:10]

Please make a note that sampling should be happening on the threads and not the
isolates.

[Cutch, 2015/08/20 20:40:18]

Done.

+  ThreadRegistry::EntryIterator it(thread_registry());
+  while (it.HasNext()) {
+    const ThreadRegistry::Entry& entry = it.Next();
+    if (entry.thread == mutator_thread_) {
+      ThreadInterrupter::InterruptThread(mutator_thread_);
+      break;
+    }
+  }
   return 1;
 }
 
 
 void Isolate::ProfileIdle() {
   vm_tag_counters_.Increment(vm_tag());
 }
 
 
 void Isolate::set_tag_table(const GrowableObjectArray& value) {
@@ skipping 132 matching lines @@
       previous->next_ = current->next_;
       return;
     }
     previous = current;
     current = current->next_;
   }
   UNREACHABLE();
 }
 
 
-#if defined(DEBUG)
-void Isolate::CheckForDuplicateThreadState(InterruptableThreadState* state) {
-  MonitorLocker ml(isolates_list_monitor_);
-  ASSERT(state != NULL);
-  Isolate* current = isolates_list_head_;
-  while (current) {
-    ASSERT(current->thread_state() != state);
-    current = current->next_;
-  }
-}
-#endif
-
-
 template<class T>
 T* Isolate::AllocateReusableHandle() {
   T* handle = reinterpret_cast<T*>(reusable_handles_.AllocateScopedHandle());
   T::initializeHandle(handle, T::null());
   return handle;
 }
 
 
 static RawInstance* DeserializeObject(Isolate* isolate,
                                       Zone* zone,
@@ skipping 194 matching lines @@
                            serialized_message_, serialized_message_len_);
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(I);
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart