Begin migration of InterruptableThreadState into Thread.

runtime/vm/thread_interrupter.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/thread_interrupter.h"
 
 #include "vm/flags.h"
 #include "vm/lockers.h"
 #include "vm/os.h"
 #include "vm/simulator.h"
@@ skipping 38 matching lines @@
             "Trace thread interrupter");
 
 bool ThreadInterrupter::initialized_ = false;
 bool ThreadInterrupter::shutdown_ = false;
 bool ThreadInterrupter::thread_running_ = false;
 ThreadId ThreadInterrupter::interrupter_thread_id_ =
     OSThread::kInvalidThreadId;
 Monitor* ThreadInterrupter::monitor_ = NULL;
 intptr_t ThreadInterrupter::interrupt_period_ = 1000;
 intptr_t ThreadInterrupter::current_wait_time_ = Monitor::kNoTimeout;
-ThreadLocalKey ThreadInterrupter::thread_state_key_ =
-    OSThread::kUnsetThreadLocalKey;
 
 
 void ThreadInterrupter::InitOnce() {
   ASSERT(!initialized_);
-  ASSERT(thread_state_key_ == OSThread::kUnsetThreadLocalKey);
-  thread_state_key_ = OSThread::CreateThreadLocal();
-  ASSERT(thread_state_key_ != OSThread::kUnsetThreadLocalKey);
   monitor_ = new Monitor();
   ASSERT(monitor_ != NULL);
   initialized_ = true;
 }
 
 
 void ThreadInterrupter::Startup() {
   ASSERT(initialized_);
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter starting up.\n");
@@ skipping 146 matching lines @@
   }
 }
 
 
 InterruptableThreadState* ThreadInterrupter::GetCurrentThreadState() {
   return _EnsureThreadStateCreated();
 }
 
 
 InterruptableThreadState* ThreadInterrupter::CurrentThreadState() {
-  InterruptableThreadState* state = reinterpret_cast<InterruptableThreadState*>(
-      OSThread::GetThreadLocal(thread_state_key_));
-  return state;
+  return Thread::Current()->thread_state();
 }
 
 
 void ThreadInterrupter::SetCurrentThreadState(InterruptableThreadState* state) {
-  OSThread::SetThreadLocal(thread_state_key_,
-                              reinterpret_cast<uword>(state));
+  Thread::Current()->set_thread_state(state);
 }
 
 
 void ThreadInterruptNoOp(const InterruptedThreadState& state, void* data) {
   // NoOp.
 }
 
 
 class ThreadInterrupterVisitIsolates : public IsolateVisitor {
  public:
@@ skipping 67 matching lines @@
   }
   {
     // Signal to main thread we are exiting.
     MonitorLocker shutdown_ml(monitor_);
     thread_running_ = false;
     shutdown_ml.Notify();
   }
 }
 
 }  // namespace dart