Reason for revert:
This CL breaks FYI bots with a compile error.
Sample error:
jingle/glue/thread_wrapper.cc -o obj/jingle/jingle_glue/thread_wrapper.o
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:46:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<rtc::Thread *, jingle_glue::JingleThreadWrapper *>' requested here
DCHECK_EQ(rtc::Thread::Current(), current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:102:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = rtc::Thread *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = rtc::Thread *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:81:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<jingle_glue::JingleThreadWrapper *, jingle_glue::JingleThreadWrapper *>' requested here
DCHECK_EQ(this, JingleThreadWrapper::current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:5:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = jingle_glue::JingleThreadWrapper *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
In file included from ../../jingle/glue/thread_wrapper.cc:5:
In file included from ../../jingle/glue/thread_wrapper.h:16:
In file included from ../../base/message_loop/message_loop.h:17:
In file included from ../../base/memory/ref_counted.h:19:
../../base/logging.h:598:1: error: call to 'MakeCheckOpString' is ambiguous
DEFINE_CHECK_OP_IMPL(EQ, ==)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../base/logging.h:592:17: note: expanded from macro 'DEFINE_CHECK_OP_IMPL'
else return MakeCheckOpString(v1, v2, names); \
^~~~~~~~~~~~~~~~~
../../jingle/glue/thread_wrapper.cc:82:3: note: in instantiation of function template specialization 'logging::CheckEQImpl<jingle_glue::JingleThreadWrapper *, rtc::Thread *>' requested here
DCHECK_EQ(this, rtc::Thread::Current());
^
../../base/logging.h:748:31: note: expanded from macro 'DCHECK_EQ'
#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2)
^
../../base/logging.h:721:18: note: expanded from macro 'DCHECK_OP'
::logging::Check##name##Impl((val1), (val2), \
^
<scratch space>:12:1: note: expanded from here
CheckEQImpl
^
../../base/logging.h:555:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = rtc::Thread *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
../../third_party/webrtc/base/checks.h:122:14: note: candidate function [with t1 = jingle_glue::JingleThreadWrapper *, t2 = rtc::Thread *]
std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
^
3 errors generated.
Original issue's description:
> Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere
>
> The former is always defined (by webrtc/base/checks.h) to either 0 or
> 1, whereas the latter isn't necessarily defined.
>
> NOTRY=true
> BUG=webrtc:6451
>
> Committed: https://crrev.com/ab0b929321d37669165d5795268fa10a8c97ec5b
> Cr-Commit-Position: refs/heads/master@{#14474}
TBR=ossu@webrtc.org,kwiberg@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6451
Review-Url: https://codereview.webrtc.org/2384083004
Cr-Commit-Position: refs/heads/master@{#14480}
188 lines
5.9 KiB
C++
188 lines
5.9 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.h.
|
|
|
|
#ifndef WEBRTC_BASE_THREAD_CHECKER_H_
|
|
#define WEBRTC_BASE_THREAD_CHECKER_H_
|
|
|
|
// Apart from debug builds, we also enable the thread checker in
|
|
// builds with DCHECK_ALWAYS_ON so that trybots and waterfall bots
|
|
// with this define will get the same level of thread checking as
|
|
// debug bots.
|
|
//
|
|
// Note that this does not perfectly match situations where RTC_DCHECK is
|
|
// enabled. For example a non-official release build may have
|
|
// DCHECK_ALWAYS_ON undefined (and therefore ThreadChecker would be
|
|
// disabled) but have RTC_DCHECKs enabled at runtime.
|
|
#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
|
|
#define ENABLE_THREAD_CHECKER 1
|
|
#else
|
|
#define ENABLE_THREAD_CHECKER 0
|
|
#endif
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/thread_annotations.h"
|
|
#include "webrtc/base/thread_checker_impl.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Do nothing implementation, for use in release mode.
|
|
//
|
|
// Note: You should almost always use the ThreadChecker class to get the
|
|
// right version for your build configuration.
|
|
class ThreadCheckerDoNothing {
|
|
public:
|
|
bool CalledOnValidThread() const {
|
|
return true;
|
|
}
|
|
|
|
void DetachFromThread() {}
|
|
};
|
|
|
|
// ThreadChecker is a helper class used to help verify that some methods of a
|
|
// class are called from the same thread. It provides identical functionality to
|
|
// base::NonThreadSafe, but it is meant to be held as a member variable, rather
|
|
// than inherited from base::NonThreadSafe.
|
|
//
|
|
// While inheriting from base::NonThreadSafe may give a clear indication about
|
|
// the thread-safety of a class, it may also lead to violations of the style
|
|
// guide with regard to multiple inheritance. The choice between having a
|
|
// ThreadChecker member and inheriting from base::NonThreadSafe should be based
|
|
// on whether:
|
|
// - Derived classes need to know the thread they belong to, as opposed to
|
|
// having that functionality fully encapsulated in the base class.
|
|
// - Derived classes should be able to reassign the base class to another
|
|
// thread, via DetachFromThread.
|
|
//
|
|
// If neither of these are true, then having a ThreadChecker member and calling
|
|
// CalledOnValidThread is the preferable solution.
|
|
//
|
|
// Example:
|
|
// class MyClass {
|
|
// public:
|
|
// void Foo() {
|
|
// RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
|
// ... (do stuff) ...
|
|
// }
|
|
//
|
|
// private:
|
|
// ThreadChecker thread_checker_;
|
|
// }
|
|
//
|
|
// In Release mode, CalledOnValidThread will always return true.
|
|
#if ENABLE_THREAD_CHECKER
|
|
class LOCKABLE ThreadChecker : public ThreadCheckerImpl {
|
|
};
|
|
#else
|
|
class LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {
|
|
};
|
|
#endif // ENABLE_THREAD_CHECKER
|
|
|
|
#undef ENABLE_THREAD_CHECKER
|
|
|
|
namespace internal {
|
|
class SCOPED_LOCKABLE AnnounceOnThread {
|
|
public:
|
|
template<typename ThreadLikeObject>
|
|
explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object)
|
|
EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
|
|
~AnnounceOnThread() UNLOCK_FUNCTION() {}
|
|
|
|
template<typename ThreadLikeObject>
|
|
static bool IsCurrent(const ThreadLikeObject* thread_like_object) {
|
|
return thread_like_object->IsCurrent();
|
|
}
|
|
static bool IsCurrent(const rtc::ThreadChecker* checker) {
|
|
return checker->CalledOnValidThread();
|
|
}
|
|
|
|
private:
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AnnounceOnThread);
|
|
};
|
|
|
|
} // namespace internal
|
|
} // namespace rtc
|
|
|
|
// RUN_ON/ACCESS_ON/RTC_DCHECK_RUN_ON macros allows to annotate variables are
|
|
// accessed from same thread/task queue.
|
|
// Using tools designed to check mutexes, it checks at compile time everywhere
|
|
// variable is access, there is a run-time dcheck thread/task queue is correct.
|
|
//
|
|
// class ExampleThread {
|
|
// public:
|
|
// void NeedVar1() {
|
|
// RTC_DCHECK_RUN_ON(network_thread_);
|
|
// transport_->Send();
|
|
// }
|
|
//
|
|
// private:
|
|
// rtc::Thread* network_thread_;
|
|
// int transport_ ACCESS_ON(network_thread_);
|
|
// };
|
|
//
|
|
// class ExampleThreadChecker {
|
|
// public:
|
|
// int CalledFromPacer() RUN_ON(pacer_thread_checker_) {
|
|
// return var2_;
|
|
// }
|
|
//
|
|
// void CallMeFromPacer() {
|
|
// RTC_DCHECK_RUN_ON(&pacer_thread_checker_)
|
|
// << "Should be called from pacer";
|
|
// CalledFromPacer();
|
|
// }
|
|
//
|
|
// private:
|
|
// int pacer_var_ ACCESS_ON(pacer_thread_checker_);
|
|
// rtc::ThreadChecker pacer_thread_checker_;
|
|
// };
|
|
//
|
|
// class TaskQueueExample {
|
|
// public:
|
|
// class Encoder {
|
|
// public:
|
|
// rtc::TaskQueue* Queue() { return encoder_queue_; }
|
|
// void Encode() {
|
|
// RTC_DCHECK_RUN_ON(encoder_queue_);
|
|
// DoSomething(var_);
|
|
// }
|
|
//
|
|
// private:
|
|
// rtc::TaskQueue* const encoder_queue_;
|
|
// Frame var_ ACCESS_ON(encoder_queue_);
|
|
// };
|
|
//
|
|
// void Encode() {
|
|
// // Will fail at runtime when DCHECK is enabled:
|
|
// // encoder_->Encode();
|
|
// // Will work:
|
|
// rtc::scoped_ref_ptr<Encoder> encoder = encoder_;
|
|
// encoder_->Queue()->PostTask([encoder] { encoder->Encode(); });
|
|
// }
|
|
//
|
|
// private:
|
|
// rtc::scoped_ref_ptr<Encoder> encoder_;
|
|
// }
|
|
|
|
// Document if a variable/field is not shared and should be accessed from
|
|
// same thread/task queue.
|
|
#define ACCESS_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
|
|
|
|
// Document if a function expected to be called from same thread/task queue.
|
|
#define RUN_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x))
|
|
|
|
#define RTC_DCHECK_RUN_ON(thread_like_object) \
|
|
rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \
|
|
RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object))
|
|
|
|
#endif // WEBRTC_BASE_THREAD_CHECKER_H_
|