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

runtime/vm/thread_interrupter_win.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 "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "vm/flags.h"
 #include "vm/os.h"
 #include "vm/profiler.h"
@@ skipping 34 matching lines @@
       state->dsp = static_cast<uintptr_t>(context.Rsp);
 #else
 #error Unsupported architecture.
 #endif
       return true;
     }
     return false;
   }
 
 
-  static void Interrupt(Thread* thread) {
-    ASSERT(!OSThread::Compare(GetCurrentThreadId(), thread->id()));
+  static void Interrupt(OSThread* os_thread) {
+    // Currently we sample only threads that are associated
+    // with an isolate.
+    Thread* thread = Thread::Current();

[Cutch, 2015/11/17 23:19:01]

On Windows this is running on a different thread than we are interrupting so
Thread::Current() will *always* be NULL.

[siva, 2015/11/18 20:25:10]

Addressed this as discussed offline.

+    if (thread == NULL) {
+      return;
+    }
+    ASSERT(!OSThread::Compare(GetCurrentThreadId(), os_thread->id()));
     HANDLE handle = OpenThread(THREAD_GET_CONTEXT |
                                THREAD_QUERY_INFORMATION |
                                THREAD_SUSPEND_RESUME,
                                false,
-                               thread->id());
+                               os_thread->id());
     ASSERT(handle != NULL);
     DWORD result = SuspendThread(handle);
     if (result == kThreadError) {
       if (FLAG_trace_thread_interrupter) {
         OS::Print("ThreadInterrupter failed to suspend thread %p\n",
-                  reinterpret_cast<void*>(thread->id()));
+                  reinterpret_cast<void*>(os_thread->id()));
       }
       CloseHandle(handle);
       return;
     }
     InterruptedThreadState its;
     if (!GrabRegisters(handle, &its)) {
       // Failed to get thread registers.
       ResumeThread(handle);
       if (FLAG_trace_thread_interrupter) {
         OS::Print("ThreadInterrupter failed to get registers for %p\n",
-                  reinterpret_cast<void*>(thread->id()));
+                  reinterpret_cast<void*>(os_thread->id()));
       }
       CloseHandle(handle);
       return;
     }
     Profiler::SampleThread(thread, its);
     ResumeThread(handle);
     CloseHandle(handle);
   }
 };
 
 
-void ThreadInterrupter::InterruptThread(Thread* thread) {
+void ThreadInterrupter::InterruptThread(OSThread* thread) {
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter suspending %p\n",
               reinterpret_cast<void*>(thread->id()));
   }
   ThreadInterrupterWin::Interrupt(thread);
   if (FLAG_trace_thread_interrupter) {
     OS::Print("ThreadInterrupter resuming %p\n",
               reinterpret_cast<void*>(thread->id()));
   }
 }
 
 
 void ThreadInterrupter::InstallSignalHandler() {
   // Nothing to do on Windows.
 }
 
 
 void ThreadInterrupter::RemoveSignalHandler() {
   // Nothing to do on Windows.
 }
 
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)
-