2016-07-12 15:04:07 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2016 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.
|
|
|
|
|
*/
|
2016-09-30 22:29:43 -07:00
|
|
|
|
2016-07-12 15:04:07 -07:00
|
|
|
#include "webrtc/base/checks.h"
|
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
|
|
|
#include "webrtc/base/platform_thread.h"
|
|
|
|
|
#include "webrtc/base/sequenced_task_checker.h"
|
|
|
|
|
#include "webrtc/base/task_queue.h"
|
2016-09-30 22:29:43 -07:00
|
|
|
#include "webrtc/test/gtest.h"
|
2016-07-12 15:04:07 -07:00
|
|
|
|
|
|
|
|
namespace rtc {
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
// Calls SequencedTaskChecker::CalledSequentially on another thread.
|
|
|
|
|
class CallCalledSequentiallyOnThread {
|
|
|
|
|
public:
|
|
|
|
|
CallCalledSequentiallyOnThread(bool expect_true,
|
|
|
|
|
SequencedTaskChecker* sequenced_task_checker)
|
|
|
|
|
: expect_true_(expect_true),
|
|
|
|
|
thread_has_run_event_(false, false),
|
|
|
|
|
thread_(&Run, this, "call_do_stuff_on_thread"),
|
|
|
|
|
sequenced_task_checker_(sequenced_task_checker) {
|
|
|
|
|
thread_.Start();
|
|
|
|
|
}
|
|
|
|
|
~CallCalledSequentiallyOnThread() {
|
|
|
|
|
EXPECT_TRUE(thread_has_run_event_.Wait(1000));
|
|
|
|
|
thread_.Stop();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
static bool Run(void* obj) {
|
|
|
|
|
CallCalledSequentiallyOnThread* call_stuff_on_thread =
|
|
|
|
|
static_cast<CallCalledSequentiallyOnThread*>(obj);
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
|
call_stuff_on_thread->expect_true_,
|
|
|
|
|
call_stuff_on_thread->sequenced_task_checker_->CalledSequentially());
|
|
|
|
|
call_stuff_on_thread->thread_has_run_event_.Set();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const bool expect_true_;
|
|
|
|
|
Event thread_has_run_event_;
|
|
|
|
|
PlatformThread thread_;
|
|
|
|
|
SequencedTaskChecker* const sequenced_task_checker_;
|
|
|
|
|
|
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(CallCalledSequentiallyOnThread);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Deletes SequencedTaskChecker on a different thread.
|
|
|
|
|
class DeleteSequencedCheckerOnThread {
|
|
|
|
|
public:
|
|
|
|
|
explicit DeleteSequencedCheckerOnThread(
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker)
|
|
|
|
|
: thread_(&Run, this, "delete_sequenced_task_checker_on_thread"),
|
|
|
|
|
thread_has_run_event_(false, false),
|
|
|
|
|
sequenced_task_checker_(std::move(sequenced_task_checker)) {
|
|
|
|
|
thread_.Start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~DeleteSequencedCheckerOnThread() {
|
|
|
|
|
EXPECT_TRUE(thread_has_run_event_.Wait(1000));
|
|
|
|
|
thread_.Stop();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
static bool Run(void* obj) {
|
|
|
|
|
DeleteSequencedCheckerOnThread* instance =
|
|
|
|
|
static_cast<DeleteSequencedCheckerOnThread*>(obj);
|
|
|
|
|
instance->sequenced_task_checker_.reset();
|
|
|
|
|
instance->thread_has_run_event_.Set();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
PlatformThread thread_;
|
|
|
|
|
Event thread_has_run_event_;
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker_;
|
|
|
|
|
|
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(DeleteSequencedCheckerOnThread);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void RunMethodOnDifferentThread(bool expect_true) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
CallCalledSequentiallyOnThread call_on_thread(expect_true,
|
|
|
|
|
sequenced_task_checker.get());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void RunMethodOnDifferentTaskQueue(bool expect_true) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
static const char kQueueName[] = "MethodNotAllowedOnDifferentTq";
|
|
|
|
|
TaskQueue queue(kQueueName);
|
|
|
|
|
Event done_event(false, false);
|
|
|
|
|
queue.PostTask([&sequenced_task_checker, &done_event, expect_true] {
|
|
|
|
|
if (expect_true)
|
|
|
|
|
EXPECT_TRUE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
else
|
|
|
|
|
EXPECT_FALSE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void DetachThenCallFromDifferentTaskQueue(bool expect_true) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
sequenced_task_checker->Detach();
|
|
|
|
|
|
|
|
|
|
Event done_event(false, false);
|
|
|
|
|
TaskQueue queue1("DetachThenCallFromDifferentTaskQueueImpl1");
|
|
|
|
|
queue1.PostTask([&sequenced_task_checker, &done_event] {
|
|
|
|
|
EXPECT_TRUE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
|
|
|
|
|
// CalledSequentially should return false in debug builds after moving to
|
|
|
|
|
// another task queue.
|
|
|
|
|
TaskQueue queue2("DetachThenCallFromDifferentTaskQueueImpl2");
|
|
|
|
|
queue2.PostTask([&sequenced_task_checker, &done_event, expect_true] {
|
|
|
|
|
if (expect_true)
|
|
|
|
|
EXPECT_TRUE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
else
|
|
|
|
|
EXPECT_FALSE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
}
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, CallsAllowedOnSameThread) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
EXPECT_TRUE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
|
|
|
|
|
// Verify that the destructor doesn't assert.
|
|
|
|
|
sequenced_task_checker.reset();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, DestructorAllowedOnDifferentThread) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
// Verify that the destructor doesn't assert when called on a different
|
|
|
|
|
// thread.
|
|
|
|
|
DeleteSequencedCheckerOnThread delete_on_thread(
|
|
|
|
|
std::move(sequenced_task_checker));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, DetachFromThread) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
sequenced_task_checker->Detach();
|
|
|
|
|
CallCalledSequentiallyOnThread call_on_thread(true,
|
|
|
|
|
sequenced_task_checker.get());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, DetachFromThreadAndUseOnTaskQueue) {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
sequenced_task_checker->Detach();
|
|
|
|
|
static const char kQueueName[] = "DetachFromThreadAndUseOnTaskQueue";
|
|
|
|
|
TaskQueue queue(kQueueName);
|
|
|
|
|
Event done_event(false, false);
|
|
|
|
|
queue.PostTask([&sequenced_task_checker, &done_event] {
|
|
|
|
|
EXPECT_TRUE(sequenced_task_checker->CalledSequentially());
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, DetachFromTaskQueueAndUseOnThread) {
|
|
|
|
|
TaskQueue queue("DetachFromTaskQueueAndUseOnThread");
|
|
|
|
|
Event done_event(false, false);
|
|
|
|
|
queue.PostTask([&done_event] {
|
|
|
|
|
std::unique_ptr<SequencedTaskChecker> sequenced_task_checker(
|
|
|
|
|
new SequencedTaskChecker());
|
|
|
|
|
|
|
|
|
|
sequenced_task_checker->Detach();
|
|
|
|
|
CallCalledSequentiallyOnThread call_on_thread(true,
|
|
|
|
|
sequenced_task_checker.get());
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
}
|
|
|
|
|
|
Revert of Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere (patchset #2 id:20001 of https://codereview.webrtc.org/2384693002/ )
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}
2016-10-03 08:32:31 -07:00
|
|
|
#if !defined(NDEBUG) || DCHECK_ALWAYS_ON
|
2016-07-12 15:04:07 -07:00
|
|
|
TEST(SequencedTaskCheckerTest, MethodNotAllowedOnDifferentThreadInDebug) {
|
|
|
|
|
RunMethodOnDifferentThread(false);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
TEST(SequencedTaskCheckerTest, MethodAllowedOnDifferentThreadInRelease) {
|
|
|
|
|
RunMethodOnDifferentThread(true);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
Revert of Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere (patchset #2 id:20001 of https://codereview.webrtc.org/2384693002/ )
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}
2016-10-03 08:32:31 -07:00
|
|
|
#if !defined(NDEBUG) || DCHECK_ALWAYS_ON
|
2016-07-12 15:04:07 -07:00
|
|
|
TEST(SequencedTaskCheckerTest, MethodNotAllowedOnDifferentTaskQueueInDebug) {
|
|
|
|
|
RunMethodOnDifferentTaskQueue(false);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
TEST(SequencedTaskCheckerTest, MethodAllowedOnDifferentTaskQueueInRelease) {
|
|
|
|
|
RunMethodOnDifferentTaskQueue(true);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
Revert of Test RTC_DCHECK_IS_ON instead of checking DCHECK_ALWAYS_ON everywhere (patchset #2 id:20001 of https://codereview.webrtc.org/2384693002/ )
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}
2016-10-03 08:32:31 -07:00
|
|
|
#if !defined(NDEBUG) || DCHECK_ALWAYS_ON
|
2016-07-12 15:04:07 -07:00
|
|
|
TEST(SequencedTaskCheckerTest, DetachFromTaskQueueInDebug) {
|
|
|
|
|
DetachThenCallFromDifferentTaskQueue(false);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
TEST(SequencedTaskCheckerTest, DetachFromTaskQueueInRelease) {
|
|
|
|
|
DetachThenCallFromDifferentTaskQueue(true);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
class TestAnnotations {
|
|
|
|
|
public:
|
|
|
|
|
TestAnnotations() : test_var_(false) {}
|
|
|
|
|
|
|
|
|
|
void ModifyTestVar() {
|
|
|
|
|
RTC_DCHECK_CALLED_SEQUENTIALLY(&checker_);
|
|
|
|
|
test_var_ = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
bool test_var_ GUARDED_BY(&checker_);
|
|
|
|
|
SequencedTaskChecker checker_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
TEST(SequencedTaskCheckerTest, TestAnnotations) {
|
|
|
|
|
TestAnnotations annotations;
|
|
|
|
|
annotations.ModifyTestVar();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
|
|
|
|
|
|
|
|
|
|
void TestAnnotationsOnWrongQueue() {
|
|
|
|
|
TestAnnotations annotations;
|
|
|
|
|
static const char kQueueName[] = "TestAnnotationsOnWrongQueueDebug";
|
|
|
|
|
TaskQueue queue(kQueueName);
|
|
|
|
|
Event done_event(false, false);
|
|
|
|
|
queue.PostTask([&annotations, &done_event] {
|
|
|
|
|
annotations.ModifyTestVar();
|
|
|
|
|
done_event.Set();
|
|
|
|
|
});
|
|
|
|
|
EXPECT_TRUE(done_event.Wait(1000));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if RTC_DCHECK_IS_ON
|
|
|
|
|
TEST(SequencedTaskCheckerTest, TestAnnotationsOnWrongQueueDebug) {
|
|
|
|
|
ASSERT_DEATH({ TestAnnotationsOnWrongQueue(); }, "");
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
TEST(SequencedTaskCheckerTest, TestAnnotationsOnWrongQueueRelease) {
|
|
|
|
|
TestAnnotationsOnWrongQueue();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#endif // GTEST_HAS_DEATH_TEST
|
|
|
|
|
} // namespace rtc
|