summaryrefslogtreecommitdiffstats
path: root/base/logging.cc
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 00:15:53 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 00:15:53 +0000
commit4613b9ca3fef46a1d868dd14b6550ad2d0c59082 (patch)
tree58507020c865cab3178aad0e53cc8e296335556b /base/logging.cc
parent7a8ac8ccdcb19d5e4e8eee3605a462dbff0c1fe5 (diff)
downloadchromium_src-4613b9ca3fef46a1d868dd14b6550ad2d0c59082.zip
chromium_src-4613b9ca3fef46a1d868dd14b6550ad2d0c59082.tar.gz
chromium_src-4613b9ca3fef46a1d868dd14b6550ad2d0c59082.tar.bz2
mach_port_deallocate() the result of mach_thread_self(), which obtains a port send right.
BUG=105513 TEST=none Review URL: http://codereview.chromium.org/9169016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
-rw-r--r--base/logging.cc21
1 files changed, 3 insertions, 18 deletions
diff --git a/base/logging.cc b/base/logging.cc
index 149bdda..1a51312 100644
--- a/base/logging.cc
+++ b/base/logging.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -51,6 +51,7 @@ typedef pthread_mutex_t* MutexHandle;
#include "base/eintr_wrapper.h"
#include "base/string_piece.h"
#include "base/synchronization/lock_impl.h"
+#include "base/threading/platform_thread.h"
#include "base/utf_string_conversions.h"
#include "base/vlog.h"
#if defined(OS_POSIX)
@@ -129,22 +130,6 @@ int32 CurrentProcessId() {
#endif
}
-int32 CurrentThreadId() {
-#if defined(OS_WIN)
- return GetCurrentThreadId();
-#elif defined(OS_MACOSX)
- return mach_thread_self();
-#elif defined(OS_LINUX)
- return syscall(__NR_gettid);
-#elif defined(OS_ANDROID)
- return gettid();
-#elif defined(OS_NACL)
- return pthread_self();
-#elif defined(OS_POSIX)
- return reinterpret_cast<int64>(pthread_self());
-#endif
-}
-
uint64 TickCount() {
#if defined(OS_WIN)
return GetTickCount();
@@ -690,7 +675,7 @@ void LogMessage::Init(const char* file, int line) {
if (log_process_id)
stream_ << CurrentProcessId() << ':';
if (log_thread_id)
- stream_ << CurrentThreadId() << ':';
+ stream_ << base::PlatformThread::CurrentId() << ':';
if (log_timestamp) {
time_t t = time(NULL);
struct tm local_time = {0};