Move ThreadChecker into rtc_base_approved.
To do this, I'm removing ThreadChecker's dependency on the 'Thread' class, so that the checker works with any thread and doesn't rely on TLS.
Also simplifying CriticalSection's implementation on Windows since a critical section on Windows already knows what thread currently owns the lock.
BUG=
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/40539004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8151 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/base/thread_checker_impl.cc b/webrtc/base/thread_checker_impl.cc
index 4a7455d..48478e7 100644
--- a/webrtc/base/thread_checker_impl.cc
+++ b/webrtc/base/thread_checker_impl.cc
@@ -12,13 +12,35 @@
#include "webrtc/base/thread_checker_impl.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/base/checks.h"
+
+#if defined(WEBRTC_LINUX)
+#include <sys/syscall.h>
+#endif
namespace rtc {
+namespace {
+PlatformThreadId CurrentThreadId() {
+#if defined(WEBRTC_WIN)
+ return GetCurrentThreadId();
+#elif defined(WEBRTC_POSIX)
+ // Pthreads doesn't have the concept of a thread ID, so we have to reach down
+ // into the kernel.
+#if defined(WEBRTC_MAC)
+ return pthread_mach_thread_np(pthread_self());
+#elif defined(WEBRTC_LINUX)
+ return syscall(__NR_gettid);
+#elif defined(WEBRTC_ANDROID)
+ return gettid();
+#else
+ // Default implementation for nacl and solaris.
+ return reinterpret_cast<pid_t>(pthread_self());
+#endif
+#endif // defined(WEBRTC_POSIX)
+}
+} // namespace
-ThreadCheckerImpl::ThreadCheckerImpl()
- : valid_thread_() {
- EnsureThreadIdAssigned();
+ThreadCheckerImpl::ThreadCheckerImpl() : valid_thread_(CurrentThreadId()) {
}
ThreadCheckerImpl::~ThreadCheckerImpl() {
@@ -26,19 +48,15 @@
bool ThreadCheckerImpl::CalledOnValidThread() const {
CritScope scoped_lock(&lock_);
- EnsureThreadIdAssigned();
- return valid_thread_->IsCurrent();
+ const PlatformThreadId current_thread = CurrentThreadId();
+ if (!valid_thread_) // Set if previously detached.
+ valid_thread_ = current_thread;
+ return valid_thread_ == current_thread;
}
void ThreadCheckerImpl::DetachFromThread() {
CritScope scoped_lock(&lock_);
- valid_thread_ = NULL;
-}
-
-void ThreadCheckerImpl::EnsureThreadIdAssigned() const {
- if (!valid_thread_) {
- valid_thread_ = Thread::Current();
- }
+ valid_thread_ = 0;
}
} // namespace rtc
