- Add an OSThread structure which is the generic TLS structure for all C++

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 57 matching lines @@
 
 
 void ThreadInterrupter::Startup() {
   ASSERT(initialized_);
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter starting up.\n");
   }
   ASSERT(interrupter_thread_id_ == OSThread::kInvalidThreadJoinId);
   {
     MonitorLocker startup_ml(monitor_);
-    OSThread::Start(ThreadMain, 0);
+    OSThread::Start("ThreadInterrupter", ThreadMain, 0);
     while (!thread_running_) {
       startup_ml.Wait();
     }
   }
   ASSERT(interrupter_thread_id_ != OSThread::kInvalidThreadJoinId);
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter running.\n");
   }
 }
 
@@ skipping 57 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_ = OSThread::GetCurrentThreadJoinId();
+    OSThread* os_thread = OSThread::Current();
+    ASSERT(os_thread != NULL);
+    interrupter_thread_id_ = os_thread->join_id();
     thread_running_ = true;
     startup_ml.Notify();
   }
   {
     intptr_t interrupted_thread_count = 0;
     current_wait_time_ = interrupt_period_;
     MonitorLocker wait_ml(monitor_);
     while (!shutdown_) {
       intptr_t r = wait_ml.WaitMicros(current_wait_time_);
 
       if (shutdown_) {
         break;
       }
 
       if ((r == Monitor::kNotified) && InDeepSleep()) {
         // Woken up from deep sleep.
         ASSERT(interrupted_thread_count == 0);
         // Return to regular interrupts.
         current_wait_time_ = interrupt_period_;
       }
 
       // Reset count before interrupting any threads.
       interrupted_thread_count = 0;
 
       // Temporarily drop the monitor while we interrupt threads.
       monitor_->Exit();
 
       {
-        ThreadIterator it;
+        OSThreadIterator it;
         while (it.HasNext()) {
-          Thread* thread = it.Next();
+          OSThread* thread = it.Next();
           if (thread->ThreadInterruptsEnabled()) {
             interrupted_thread_count++;
             InterruptThread(thread);
           }
         }
       }
 
       // Take the monitor lock again.
       monitor_->Enter();
 
@@ skipping 18 matching lines @@
   }
   {
     // Signal to main thread we are exiting.
     MonitorLocker shutdown_ml(monitor_);
     thread_running_ = false;
     shutdown_ml.Notify();
   }
 }
 
 }  // namespace dart