Rename Thread -> OSThread.

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 33 matching lines @@
 // thread local storage pointer is set again. This has an important side
 // effect: if the thread is interrupted by a signal handler during a ThreadState
 // update the signal handler will immediately return.
 
 DEFINE_FLAG(bool, trace_thread_interrupter, false,
             "Trace thread interrupter");
 
 bool ThreadInterrupter::initialized_ = false;
 bool ThreadInterrupter::shutdown_ = false;
 bool ThreadInterrupter::thread_running_ = false;
-ThreadId ThreadInterrupter::interrupter_thread_id_ = Thread::kInvalidThreadId;
+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_ =
-    Thread::kUnsetThreadLocalKey;
+    OSThread::kUnsetThreadLocalKey;
 
 
 void ThreadInterrupter::InitOnce() {
   ASSERT(!initialized_);
-  ASSERT(thread_state_key_ == Thread::kUnsetThreadLocalKey);
-  thread_state_key_ = Thread::CreateThreadLocal();
-  ASSERT(thread_state_key_ != Thread::kUnsetThreadLocalKey);
+  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");
   }
-  ASSERT(interrupter_thread_id_ == Thread::kInvalidThreadId);
+  ASSERT(interrupter_thread_id_ == OSThread::kInvalidThreadId);
   {
     MonitorLocker startup_ml(monitor_);
-    Thread::Start(ThreadMain, 0);
+    OSThread::Start(ThreadMain, 0);
     while (!thread_running_) {
       startup_ml.Wait();
     }
   }
-  ASSERT(interrupter_thread_id_ != Thread::kInvalidThreadId);
+  ASSERT(interrupter_thread_id_ != OSThread::kInvalidThreadId);
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter running.\n");
   }
 }
 
 
 void ThreadInterrupter::Shutdown() {
   {
     MonitorLocker shutdown_ml(monitor_);
     if (shutdown_) {
       // Already shutdown.
       return;
     }
     shutdown_ = true;
     // Notify.
     monitor_->Notify();
     ASSERT(initialized_);
     if (FLAG_trace_thread_interrupter) {
       OS::Print("ThreadInterrupter shutting down.\n");
     }
   }
 #if defined(TARGET_OS_WINDOWS)
   // On Windows, a thread's exit-code can leak into the process's exit-code,
   // if exiting 'at same time' as the process ends. By joining with the thread
   // here, we avoid this race condition.
-  ASSERT(interrupter_thread_id_ != Thread::kInvalidThreadId);
-  Thread::Join(interrupter_thread_id_);
-  interrupter_thread_id_ = Thread::kInvalidThreadId;
+  ASSERT(interrupter_thread_id_ != OSThread::kInvalidThreadId);
+  OSThread::Join(interrupter_thread_id_);
+  interrupter_thread_id_ = OSThread::kInvalidThreadId;
 #else
   // On non-Windows platforms, just wait for the thread interrupter to signal
   // that it has exited the loop.
   {
     MonitorLocker shutdown_ml(monitor_);
     while (thread_running_) {
       // Wait for thread to exit.
       shutdown_ml.Wait();
     }
   }
@@ skipping 51 matching lines @@
   _EnsureThreadStateCreated();
   // Clear callback and data.
   UpdateStateObject(NULL, NULL);
 }
 
 
 InterruptableThreadState* ThreadInterrupter::_EnsureThreadStateCreated() {
   InterruptableThreadState* state = CurrentThreadState();
   if (state == NULL) {
     // Create thread state object lazily.
-    ThreadId current_thread = Thread::GetCurrentThreadId();
+    ThreadId current_thread = OSThread::GetCurrentThreadId();
     if (FLAG_trace_thread_interrupter) {
-      intptr_t tid = Thread::ThreadIdToIntPtr(current_thread);
+      intptr_t tid = OSThread::ThreadIdToIntPtr(current_thread);
       OS::Print("ThreadInterrupter Tracking %p\n",
                 reinterpret_cast<void*>(tid));
     }
     // Note: We currently do not free a thread's InterruptableThreadState.
     state = new InterruptableThreadState();
     ASSERT(state != NULL);
     state->callback = NULL;
     state->data = NULL;
     state->id = current_thread;
     SetCurrentThreadState(state);
   }
   return state;
 }
 
 
 void ThreadInterrupter::UpdateStateObject(ThreadInterruptCallback callback,
                                           void* data) {
   InterruptableThreadState* state = CurrentThreadState();
-  ThreadId current_thread = Thread::GetCurrentThreadId();
+  ThreadId current_thread = OSThread::GetCurrentThreadId();
   ASSERT(state != NULL);
-  ASSERT(Thread::Compare(state->id, Thread::GetCurrentThreadId()));
+  ASSERT(OSThread::Compare(state->id, OSThread::GetCurrentThreadId()));
   SetCurrentThreadState(NULL);
   // It is now safe to modify the state object. If an interrupt occurs,
   // the current thread state will be NULL.
   state->callback = callback;
   state->data = data;
   SetCurrentThreadState(state);
   if (FLAG_trace_thread_interrupter) {
-    intptr_t tid = Thread::ThreadIdToIntPtr(current_thread);
+    intptr_t tid = OSThread::ThreadIdToIntPtr(current_thread);
     if (callback == NULL) {
       OS::Print("ThreadInterrupter Cleared %p\n", reinterpret_cast<void*>(tid));
     } else {
       OS::Print("ThreadInterrupter Updated %p\n", reinterpret_cast<void*>(tid));
     }
   }
 }
 
 
 InterruptableThreadState* ThreadInterrupter::GetCurrentThreadState() {
   return _EnsureThreadStateCreated();
 }
 
 
 InterruptableThreadState* ThreadInterrupter::CurrentThreadState() {
   InterruptableThreadState* state = reinterpret_cast<InterruptableThreadState*>(
-      Thread::GetThreadLocal(thread_state_key_));
+      OSThread::GetThreadLocal(thread_state_key_));
   return state;
 }
 
 
 void ThreadInterrupter::SetCurrentThreadState(InterruptableThreadState* state) {
-  Thread::SetThreadLocal(thread_state_key_, reinterpret_cast<uword>(state));
+  OSThread::SetThreadLocal(thread_state_key_,
+                              reinterpret_cast<uword>(state));
 }
 
 
 void ThreadInterruptNoOp(const InterruptedThreadState& state, void* data) {
   // NoOp.
 }
 
 
 class ThreadInterrupterVisitIsolates : public IsolateVisitor {
  public:
@@ skipping 21 matching lines @@
 
 void ThreadInterrupter::ThreadMain(uword parameters) {
   ASSERT(initialized_);
   InstallSignalHandler();
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter thread running.\n");
   }
   {
     // Signal to main thread we are ready.
     MonitorLocker startup_ml(monitor_);
-    interrupter_thread_id_ = Thread::GetCurrentThreadId();
+    interrupter_thread_id_ = OSThread::GetCurrentThreadId();
     thread_running_ = true;
     startup_ml.Notify();
   }
   {
     ThreadInterrupterVisitIsolates visitor;
     current_wait_time_ = interrupt_period_;
     MonitorLocker wait_ml(monitor_);
     while (!shutdown_) {
       intptr_t r = wait_ml.WaitMicros(current_wait_time_);
 
@@ skipping 24 matching lines @@
   }
   {
     // Signal to main thread we are exiting.
     MonitorLocker shutdown_ml(monitor_);
     thread_running_ = false;
     shutdown_ml.Notify();
   }
 }
 
 }  // namespace dart