Begin migration of InterruptableThreadState into Thread.

runtime/vm/thread.cc

 // Copyright (c) 2015, 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/thread.h"
 
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/object.h"
 #include "vm/os_thread.h"
 #include "vm/profiler.h"
 #include "vm/stub_code.h"
 #include "vm/thread_interrupter.h"
 #include "vm/thread_registry.h"
 
 namespace dart {
 
 // The single thread local key which stores all the thread local data
 // for a thread.
-// TODO(koda): Can we merge this with ThreadInterrupter::thread_state_key_?
 ThreadLocalKey Thread::thread_key_ = OSThread::kUnsetThreadLocalKey;
 
 
 static void DeleteThread(void* thread) {
   delete reinterpret_cast<Thread*>(thread);
 }
 
 
 Thread::~Thread() {
   // We should cleanly exit any isolate before destruction.
@@ skipping 87 matching lines @@
 }
 
 
 void Thread::EnterIsolate(Isolate* isolate) {
   Thread* thread = Thread::Current();
   ASSERT(thread != NULL);
   ASSERT(thread->isolate() == NULL);
   ASSERT(isolate->mutator_thread() == NULL);
   thread->isolate_ = isolate;
   isolate->set_mutator_thread(thread);
-  // TODO(koda): Migrate thread_state_ and profile_data_ to Thread, to allow
-  // helper threads concurrent with mutator.
-  ASSERT(isolate->thread_state() == NULL);
+  ASSERT(thread->thread_state() == NULL);
   InterruptableThreadState* thread_state =
       ThreadInterrupter::GetCurrentThreadState();
 #if defined(DEBUG)
+  thread->set_thread_state(NULL);  // Exclude thread itself from the dupe check.
   Isolate::CheckForDuplicateThreadState(thread_state);
+  thread->set_thread_state(thread_state);
 #endif
   ASSERT(thread_state != NULL);
+  // TODO(koda): Migrate profiler interface to use Thread.
   Profiler::BeginExecution(isolate);
-  isolate->set_thread_state(thread_state);
   isolate->set_vm_tag(VMTag::kVMTagId);
   ASSERT(thread->store_buffer_block_ == NULL);
   thread->store_buffer_block_ = isolate->store_buffer()->PopBlock();
   ASSERT(isolate->heap() != NULL);
   thread->heap_ = isolate->heap();
   thread->Schedule(isolate);
 }
 
 
 void Thread::ExitIsolate() {
   Thread* thread = Thread::Current();
   // TODO(koda): Audit callers; they should know whether they're in an isolate.
   if (thread == NULL || thread->isolate() == NULL) return;
   Isolate* isolate = thread->isolate();
   thread->Unschedule();
   StoreBufferBlock* block = thread->store_buffer_block_;
   thread->store_buffer_block_ = NULL;
   isolate->store_buffer()->PushBlock(block);
   if (isolate->is_runnable()) {
     isolate->set_vm_tag(VMTag::kIdleTagId);
   } else {
     isolate->set_vm_tag(VMTag::kLoadWaitTagId);
   }
-  isolate->set_thread_state(NULL);
   Profiler::EndExecution(isolate);
+  thread->set_thread_state(NULL);
   isolate->set_mutator_thread(NULL);
   thread->isolate_ = NULL;
   ASSERT(Isolate::Current() == NULL);
   thread->heap_ = NULL;
 }
 
 
 void Thread::EnterIsolateAsHelper(Isolate* isolate) {
   Thread* thread = Thread::Current();
   ASSERT(thread != NULL);
   ASSERT(thread->isolate() == NULL);
   thread->isolate_ = isolate;
   ASSERT(isolate->heap() != NULL);
   thread->heap_ = isolate->heap();
+  ASSERT(thread->thread_state() == NULL);
   // Do not update isolate->mutator_thread, but perform sanity check:
   // this thread should not be both the main mutator and helper.
   ASSERT(isolate->mutator_thread() != thread);
   thread->Schedule(isolate);
 }
 
 
 void Thread::ExitIsolateAsHelper() {
   Thread* thread = Thread::Current();
   // If the helper thread chose to use the store buffer, check that it has
   // already been flushed manually.
   ASSERT(thread->store_buffer_block_ == NULL);
   Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
   thread->Unschedule();
+  thread->set_thread_state(NULL);
   thread->isolate_ = NULL;
   thread->heap_ = NULL;
   ASSERT(isolate->mutator_thread() != thread);
 }
 
 
 void Thread::PrepareForGC() {
   Thread* thread = Thread::Current();
   StoreBuffer* sb = thread->isolate()->store_buffer();
   StoreBufferBlock* block = thread->store_buffer_block_;
@@ skipping 54 matching lines @@
 #define COMPUTE_OFFSET(type_name, member_name, expr, default_init_value)       \
   ASSERT((expr)->IsVMHeapObject());                                            \
   if (object.raw() == expr) return Thread::member_name##offset();
 CACHED_VM_OBJECTS_LIST(COMPUTE_OFFSET)
 #undef COMPUTE_OFFSET
   UNREACHABLE();
   return -1;
 }
 
 }  // namespace dart