Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: base/threading/platform_thread_posix.cc

Issue 1164713007: base/threading: minor cleanups to remove friend class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove debug code Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <sys/resource.h> 10 #include <sys/resource.h>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 delegate, &unused, ThreadPriority::NORMAL); 222 delegate, &unused, ThreadPriority::NORMAL);
223 return result; 223 return result;
224 } 224 }
225 225
226 // static 226 // static
227 void PlatformThread::Join(PlatformThreadHandle thread_handle) { 227 void PlatformThread::Join(PlatformThreadHandle thread_handle) {
228 // Joining another thread may block the current thread for a long time, since 228 // Joining another thread may block the current thread for a long time, since
229 // the thread referred to by |thread_handle| may still be running long-lived / 229 // the thread referred to by |thread_handle| may still be running long-lived /
230 // blocking tasks. 230 // blocking tasks.
231 base::ThreadRestrictions::AssertIOAllowed(); 231 base::ThreadRestrictions::AssertIOAllowed();
232 CHECK_EQ(0, pthread_join(thread_handle.handle_, NULL)); 232 CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), NULL));
233 } 233 }
234 234
235 // Mac has its own Set/GetThreadPriority() implementations. 235 // Mac has its own Set/GetThreadPriority() implementations.
236 #if !defined(OS_MACOSX) 236 #if !defined(OS_MACOSX)
237 237
238 // static 238 // static
239 void PlatformThread::SetThreadPriority(PlatformThreadHandle handle, 239 void PlatformThread::SetThreadPriority(PlatformThreadHandle handle,
240 ThreadPriority priority) { 240 ThreadPriority priority) {
241 #if defined(OS_NACL) 241 #if defined(OS_NACL)
242 NOTIMPLEMENTED(); 242 NOTIMPLEMENTED();
243 #else 243 #else
244 if (internal::SetThreadPriorityForPlatform(handle, priority)) 244 if (internal::SetThreadPriorityForPlatform(handle, priority))
245 return; 245 return;
246 246
247 // setpriority(2) should change the whole thread group's (i.e. process) 247 // setpriority(2) should change the whole thread group's (i.e. process)
248 // priority. However, as stated in the bugs section of 248 // priority. However, as stated in the bugs section of
249 // http://man7.org/linux/man-pages/man2/getpriority.2.html: "under the current 249 // http://man7.org/linux/man-pages/man2/getpriority.2.html: "under the current
250 // Linux/NPTL implementation of POSIX threads, the nice value is a per-thread 250 // Linux/NPTL implementation of POSIX threads, the nice value is a per-thread
251 // attribute". Also, 0 is prefered to the current thread id since it is 251 // attribute". Also, 0 is prefered to the current thread id since it is
252 // equivalent but makes sandboxing easier (https://crbug.com/399473). 252 // equivalent but makes sandboxing easier (https://crbug.com/399473).
253 DCHECK_NE(handle.id_, kInvalidThreadId); 253 DCHECK_NE(handle.id(), kInvalidThreadId);
254 const int nice_setting = internal::ThreadPriorityToNiceValue(priority); 254 const int nice_setting = internal::ThreadPriorityToNiceValue(priority);
255 const PlatformThreadId current_id = PlatformThread::CurrentId(); 255 const PlatformThreadId current_id = PlatformThread::CurrentId();
256 if (setpriority(PRIO_PROCESS, handle.id_ == current_id ? 0 : handle.id_, 256 if (setpriority(PRIO_PROCESS, handle.id() == current_id ? 0 : handle.id(),
257 nice_setting)) { 257 nice_setting)) {
258 DVPLOG(1) << "Failed to set nice value of thread (" << handle.id_ << ") to " 258 DVPLOG(1) << "Failed to set nice value of thread (" << handle.id()
259 << nice_setting; 259 << ") to " << nice_setting;
260 } 260 }
261 #endif // defined(OS_NACL) 261 #endif // defined(OS_NACL)
262 } 262 }
263 263
264 // static 264 // static
265 ThreadPriority PlatformThread::GetThreadPriority(PlatformThreadHandle handle) { 265 ThreadPriority PlatformThread::GetThreadPriority(PlatformThreadHandle handle) {
266 #if defined(OS_NACL) 266 #if defined(OS_NACL)
267 NOTIMPLEMENTED(); 267 NOTIMPLEMENTED();
268 return ThreadPriority::NORMAL; 268 return ThreadPriority::NORMAL;
269 #else 269 #else
270 // Mirrors SetThreadPriority()'s implementation. 270 // Mirrors SetThreadPriority()'s implementation.
271 ThreadPriority platform_specific_priority; 271 ThreadPriority platform_specific_priority;
272 if (internal::GetThreadPriorityForPlatform(handle, 272 if (internal::GetThreadPriorityForPlatform(handle,
273 &platform_specific_priority)) { 273 &platform_specific_priority)) {
274 return platform_specific_priority; 274 return platform_specific_priority;
275 } 275 }
276 276
277 DCHECK_NE(handle.id_, kInvalidThreadId); 277 DCHECK_NE(handle.id(), kInvalidThreadId);
278 const PlatformThreadId current_id = PlatformThread::CurrentId(); 278 const PlatformThreadId current_id = PlatformThread::CurrentId();
279 // Need to clear errno before calling getpriority(): 279 // Need to clear errno before calling getpriority():
280 // http://man7.org/linux/man-pages/man2/getpriority.2.html 280 // http://man7.org/linux/man-pages/man2/getpriority.2.html
281 errno = 0; 281 errno = 0;
282 int nice_value = 282 int nice_value =
283 getpriority(PRIO_PROCESS, handle.id_ == current_id ? 0 : handle.id_); 283 getpriority(PRIO_PROCESS, handle.id() == current_id ? 0 : handle.id());
284 if (errno != 0) { 284 if (errno != 0) {
285 DVPLOG(1) << "Failed to get nice value of thread (" << handle.id_ << ")"; 285 DVPLOG(1) << "Failed to get nice value of thread (" << handle.id() << ")";
286 return ThreadPriority::NORMAL; 286 return ThreadPriority::NORMAL;
287 } 287 }
288 288
289 return internal::NiceValueToThreadPriority(nice_value); 289 return internal::NiceValueToThreadPriority(nice_value);
290 #endif // !defined(OS_NACL) 290 #endif // !defined(OS_NACL)
291 } 291 }
292 292
293 #endif // !defined(OS_MACOSX) 293 #endif // !defined(OS_MACOSX)
294 294
295 } // namespace base 295 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698