OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/threading/platform_thread.h" | 5 #include "base/threading/platform_thread.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <pthread.h> | 8 #include <pthread.h> |
9 #include <sched.h> | 9 #include <sched.h> |
10 #include <stddef.h> | 10 #include <stddef.h> |
11 #include <stdint.h> | 11 #include <stdint.h> |
12 #include <sys/resource.h> | 12 #include <sys/resource.h> |
13 #include <sys/time.h> | 13 #include <sys/time.h> |
14 | 14 |
15 #include <memory> | 15 #include <memory> |
16 | 16 |
| 17 #include "base/debug/activity_tracker.h" |
17 #include "base/lazy_instance.h" | 18 #include "base/lazy_instance.h" |
18 #include "base/logging.h" | 19 #include "base/logging.h" |
19 #include "base/threading/platform_thread_internal_posix.h" | 20 #include "base/threading/platform_thread_internal_posix.h" |
20 #include "base/threading/thread_id_name_manager.h" | 21 #include "base/threading/thread_id_name_manager.h" |
21 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
22 #include "build/build_config.h" | 23 #include "build/build_config.h" |
23 | 24 |
24 #if defined(OS_LINUX) | 25 #if defined(OS_LINUX) |
25 #include <sys/syscall.h> | 26 #include <sys/syscall.h> |
26 #elif defined(OS_ANDROID) | 27 #elif defined(OS_ANDROID) |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 bool PlatformThread::CreateNonJoinable(size_t stack_size, Delegate* delegate) { | 196 bool PlatformThread::CreateNonJoinable(size_t stack_size, Delegate* delegate) { |
196 PlatformThreadHandle unused; | 197 PlatformThreadHandle unused; |
197 | 198 |
198 bool result = CreateThread(stack_size, false /* non-joinable thread */, | 199 bool result = CreateThread(stack_size, false /* non-joinable thread */, |
199 delegate, &unused, ThreadPriority::NORMAL); | 200 delegate, &unused, ThreadPriority::NORMAL); |
200 return result; | 201 return result; |
201 } | 202 } |
202 | 203 |
203 // static | 204 // static |
204 void PlatformThread::Join(PlatformThreadHandle thread_handle) { | 205 void PlatformThread::Join(PlatformThreadHandle thread_handle) { |
| 206 // Record the event that this thread is blocking upon (for hang diagnosis). |
| 207 base::debug::ScopedThreadJoinActivity thread_activity(&thread_handle); |
| 208 |
205 // Joining another thread may block the current thread for a long time, since | 209 // Joining another thread may block the current thread for a long time, since |
206 // the thread referred to by |thread_handle| may still be running long-lived / | 210 // the thread referred to by |thread_handle| may still be running long-lived / |
207 // blocking tasks. | 211 // blocking tasks. |
208 base::ThreadRestrictions::AssertIOAllowed(); | 212 base::ThreadRestrictions::AssertIOAllowed(); |
209 CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), NULL)); | 213 CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), NULL)); |
210 } | 214 } |
211 | 215 |
212 // static | 216 // static |
213 void PlatformThread::Detach(PlatformThreadHandle thread_handle) { | 217 void PlatformThread::Detach(PlatformThreadHandle thread_handle) { |
214 CHECK_EQ(0, pthread_detach(thread_handle.platform_handle())); | 218 CHECK_EQ(0, pthread_detach(thread_handle.platform_handle())); |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 return ThreadPriority::NORMAL; | 266 return ThreadPriority::NORMAL; |
263 } | 267 } |
264 | 268 |
265 return internal::NiceValueToThreadPriority(nice_value); | 269 return internal::NiceValueToThreadPriority(nice_value); |
266 #endif // !defined(OS_NACL) | 270 #endif // !defined(OS_NACL) |
267 } | 271 } |
268 | 272 |
269 #endif // !defined(OS_MACOSX) | 273 #endif // !defined(OS_MACOSX) |
270 | 274 |
271 } // namespace base | 275 } // namespace base |
OLD | NEW |