2eb1660791
Like PlatformThreadId, this type is borrowed from Chromium.
The difference between the two is that PlatformThreadRef is pthread_t on posix platforms.
On Windows PlatformThreadRef and PlatformThreadId are the same thing.
The reason for this switch is pretty crazy. On Chromium's "Mac 10.9 dbg" bot,
we have been seeing the following code:
ThreadCheckerImpl::ThreadCheckerImpl() : valid_thread_(CurrentThreadId()) {
fprintf(stderr, "*** valid=%d\n", valid_thread_);
valid_thread_ = CurrentThreadId();
fprintf(stderr, "*** valid after=%d\n", valid_thread_);
}
print this:
*** valid=946872320
*** valid after=5647
This is for the same thread checker instance.
What's worse is that printing out what CurrentThreadId was returning, yielded that it was always returning 5647.
After switching over to pthread_t on Mac, this stopped happening.
So, to remove the current hack, reinstate the class on Mac and take a look at the next problem, I'm switching to pthread_t.
Really looking forward to truly getting to the bottom of this.
Tbr-ing since the build is essentially broken (we can't roll).
TBR=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/37199004
Cr-Commit-Position: refs/heads/master@{#8283}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8283 4adac7df-926f-26a2-2b94-8c16560cd09d
79 lines
2.0 KiB
C++
79 lines
2.0 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
// Borrowed from Chromium's src/base/threading/thread_checker_impl.cc.
|
|
|
|
#include "webrtc/base/thread_checker_impl.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
|
|
#if defined(WEBRTC_LINUX)
|
|
#include <sys/syscall.h>
|
|
#endif
|
|
|
|
namespace rtc {
|
|
|
|
PlatformThreadId CurrentThreadId() {
|
|
PlatformThreadId ret;
|
|
#if defined(WEBRTC_WIN)
|
|
ret = GetCurrentThreadId();
|
|
#elif defined(WEBRTC_POSIX)
|
|
#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
|
|
ret = pthread_mach_thread_np(pthread_self());
|
|
#elif defined(WEBRTC_LINUX)
|
|
ret = syscall(__NR_gettid);
|
|
#elif defined(WEBRTC_ANDROID)
|
|
ret = gettid();
|
|
#else
|
|
// Default implementation for nacl and solaris.
|
|
ret = reinterpret_cast<pid_t>(pthread_self());
|
|
#endif
|
|
#endif // defined(WEBRTC_POSIX)
|
|
DCHECK(ret);
|
|
return ret;
|
|
}
|
|
|
|
PlatformThreadRef CurrentThreadRef() {
|
|
#if defined(WEBRTC_WIN)
|
|
return GetCurrentThreadId();
|
|
#elif defined(WEBRTC_POSIX)
|
|
return pthread_self();
|
|
#endif
|
|
}
|
|
|
|
bool IsThreadRefEqual(const PlatformThreadRef& a, const PlatformThreadRef& b) {
|
|
#if defined(WEBRTC_WIN)
|
|
return a == b;
|
|
#elif defined(WEBRTC_POSIX)
|
|
return pthread_equal(a, b);
|
|
#endif
|
|
}
|
|
|
|
ThreadCheckerImpl::ThreadCheckerImpl() : valid_thread_(CurrentThreadRef()) {
|
|
}
|
|
|
|
ThreadCheckerImpl::~ThreadCheckerImpl() {
|
|
}
|
|
|
|
bool ThreadCheckerImpl::CalledOnValidThread() const {
|
|
const PlatformThreadRef current_thread = CurrentThreadRef();
|
|
CritScope scoped_lock(&lock_);
|
|
if (!valid_thread_) // Set if previously detached.
|
|
valid_thread_ = current_thread;
|
|
return IsThreadRefEqual(valid_thread_, current_thread);
|
|
}
|
|
|
|
void ThreadCheckerImpl::DetachFromThread() {
|
|
CritScope scoped_lock(&lock_);
|
|
valid_thread_ = 0;
|
|
}
|
|
|
|
} // namespace rtc
|