OLD | NEW |
---|---|
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 #include "platform/globals.h" | 5 #include "platform/globals.h" |
6 #if defined(TARGET_OS_LINUX) | 6 #if defined(TARGET_OS_LINUX) |
7 | 7 |
8 #include <errno.h> // NOLINT | 8 #include <errno.h> // NOLINT |
9 | 9 |
10 #include "vm/flags.h" | 10 #include "vm/flags.h" |
11 #include "vm/os.h" | 11 #include "vm/os.h" |
12 #include "vm/profiler.h" | 12 #include "vm/profiler.h" |
13 #include "vm/signal_handler.h" | 13 #include "vm/signal_handler.h" |
14 #include "vm/thread_interrupter.h" | 14 #include "vm/thread_interrupter.h" |
15 | 15 |
16 namespace dart { | 16 namespace dart { |
17 | 17 |
18 DECLARE_FLAG(bool, thread_interrupter); | 18 DECLARE_FLAG(bool, thread_interrupter); |
19 DECLARE_FLAG(bool, trace_thread_interrupter); | 19 DECLARE_FLAG(bool, trace_thread_interrupter); |
20 | 20 |
21 class ThreadInterrupterLinux : public AllStatic { | 21 class ThreadInterrupterLinux : public AllStatic { |
22 public: | 22 public: |
23 static void ThreadInterruptSignalHandler(int signal, siginfo_t* info, | 23 static void ThreadInterruptSignalHandler(int signal, siginfo_t* info, |
24 void* context_) { | 24 void* context_) { |
25 if (signal != SIGPROF) { | 25 if (signal != SIGPROF) { |
26 return; | 26 return; |
27 } | 27 } |
28 Thread* thread = Thread::Current(); | 28 Thread* thread = Thread::Current(); |
Cutch
2015/11/14 00:31:56
I think this should be OSThread and not Thread.
siva
2015/11/14 01:38:26
Currently SampleThread in the profiler only seems
| |
29 if (thread == NULL) { | 29 if (thread == NULL) { |
30 return; | 30 return; |
31 } | 31 } |
32 // Extract thread state. | 32 // Extract thread state. |
33 ucontext_t* context = reinterpret_cast<ucontext_t*>(context_); | 33 ucontext_t* context = reinterpret_cast<ucontext_t*>(context_); |
34 mcontext_t mcontext = context->uc_mcontext; | 34 mcontext_t mcontext = context->uc_mcontext; |
35 InterruptedThreadState its; | 35 InterruptedThreadState its; |
36 its.pc = SignalHandler::GetProgramCounter(mcontext); | 36 its.pc = SignalHandler::GetProgramCounter(mcontext); |
37 its.fp = SignalHandler::GetFramePointer(mcontext); | 37 its.fp = SignalHandler::GetFramePointer(mcontext); |
38 its.csp = SignalHandler::GetCStackPointer(mcontext); | 38 its.csp = SignalHandler::GetCStackPointer(mcontext); |
39 its.dsp = SignalHandler::GetDartStackPointer(mcontext); | 39 its.dsp = SignalHandler::GetDartStackPointer(mcontext); |
40 its.lr = SignalHandler::GetLinkRegister(mcontext); | 40 its.lr = SignalHandler::GetLinkRegister(mcontext); |
41 Profiler::SampleThread(thread, its); | 41 Profiler::SampleThread(thread, its); |
42 } | 42 } |
43 }; | 43 }; |
44 | 44 |
45 | 45 |
46 void ThreadInterrupter::InterruptThread(Thread* thread) { | 46 void ThreadInterrupter::InterruptThread(OSThread* thread) { |
Cutch
2015/11/14 00:31:56
This change needs to be made in os_thread_interrup
siva
2015/11/14 01:38:26
Good catch.
Done.
| |
47 if (FLAG_trace_thread_interrupter) { | 47 if (FLAG_trace_thread_interrupter) { |
48 OS::Print("ThreadInterrupter interrupting %p\n", | 48 OS::Print("ThreadInterrupter interrupting %p\n", |
49 reinterpret_cast<void*>(thread->id())); | 49 reinterpret_cast<void*>(thread->id())); |
50 } | 50 } |
51 int result = pthread_kill(thread->id(), SIGPROF); | 51 int result = pthread_kill(thread->id(), SIGPROF); |
52 ASSERT((result == 0) || (result == ESRCH)); | 52 ASSERT((result == 0) || (result == ESRCH)); |
53 } | 53 } |
54 | 54 |
55 | 55 |
56 void ThreadInterrupter::InstallSignalHandler() { | 56 void ThreadInterrupter::InstallSignalHandler() { |
57 SignalHandler::Install(ThreadInterrupterLinux::ThreadInterruptSignalHandler); | 57 SignalHandler::Install(ThreadInterrupterLinux::ThreadInterruptSignalHandler); |
58 } | 58 } |
59 | 59 |
60 | 60 |
61 void ThreadInterrupter::RemoveSignalHandler() { | 61 void ThreadInterrupter::RemoveSignalHandler() { |
62 SignalHandler::Remove(); | 62 SignalHandler::Remove(); |
63 } | 63 } |
64 | 64 |
65 | 65 |
66 } // namespace dart | 66 } // namespace dart |
67 | 67 |
68 #endif // defined(TARGET_OS_LINUX) | 68 #endif // defined(TARGET_OS_LINUX) |
OLD | NEW |