Chromium Code Reviews| Index: runtime/vm/thread_interrupter_win.cc |
| diff --git a/runtime/vm/thread_interrupter_win.cc b/runtime/vm/thread_interrupter_win.cc |
| index 70a5e8c93f877bc049eef271a4c32bae48bdf558..93677431fd12f49ed8bff46978a984027cf16f50 100644 |
| --- a/runtime/vm/thread_interrupter_win.cc |
| +++ b/runtime/vm/thread_interrupter_win.cc |
| @@ -7,8 +7,10 @@ |
| #include "vm/flags.h" |
| #include "vm/os.h" |
| +#include "vm/profiler.h" |
| #include "vm/thread_interrupter.h" |
| + |
| namespace dart { |
| DECLARE_FLAG(bool, thread_interrupter); |
| @@ -69,7 +71,6 @@ class ThreadInterrupterWin : public AllStatic { |
| return; |
| } |
| InterruptedThreadState its; |
| - its.tid = thread->id(); |
| if (!GrabRegisters(handle, &its)) { |
| // Failed to get thread registers. |
| ResumeThread(handle); |
| @@ -80,11 +81,8 @@ class ThreadInterrupterWin : public AllStatic { |
| CloseHandle(handle); |
| return; |
| } |
| - ThreadInterruptCallback callback = NULL; |
| - void* callback_data = NULL; |
| - if (thread->IsThreadInterrupterEnabled(&callback, &callback_data)) { |
| - callback(its, callback_data); |
| - } |
| + ThreadInterruptCallback callback = Profiler::SampleThreadInterruptCallback; |
| + callback(thread, its); |
|
Ivan Posva
2015/10/28 19:31:53
ditto, here and other places.
Cutch
2015/10/28 19:50:33
Done.
|
| ResumeThread(handle); |
| CloseHandle(handle); |
| } |