Index: base/threading/thread_perftest.cc |
diff --git a/base/threading/thread_perftest.cc b/base/threading/thread_perftest.cc |
index 2071889848469d73eb303cfe119943e808c39555..1df13883169ebab2e73ef39dd31b620913fa83ca 100644 |
--- a/base/threading/thread_perftest.cc |
+++ b/base/threading/thread_perftest.cc |
@@ -180,8 +180,11 @@ template <typename WaitableEventType> |
class EventPerfTest : public ThreadPerfTest { |
public: |
void Init() override { |
- for (size_t i = 0; i < threads_.size(); i++) |
- events_.push_back(new WaitableEventType(false, false)); |
+ for (size_t i = 0; i < threads_.size(); i++) { |
+ events_.push_back( |
+ new WaitableEventType(WaitableEvent::ResetPolicy::AUTOMATIC, |
+ WaitableEvent::InitialState::NOT_SIGNALED)); |
+ } |
} |
void Reset() override { events_.clear(); } |
@@ -228,10 +231,11 @@ TEST_F(WaitableEventPerfTest, EventPingPong) { |
// Build a minimal event using ConditionVariable. |
class ConditionVariableEvent { |
public: |
- ConditionVariableEvent(bool manual_reset, bool initially_signaled) |
+ ConditionVariableEvent(WaitableEvent::ResetPolicy reset_policy, |
+ WaitableEvent::InitialState initial_state) |
: cond_(&lock_), signaled_(false) { |
- DCHECK(!manual_reset); |
- DCHECK(!initially_signaled); |
+ DCHECK_EQ(WaitableEvent::ResetPolicy::AUTOMATIC, reset_policy); |
+ DCHECK_EQ(WaitableEvent::InitialState::NOT_SIGNALED, initial_state); |
} |
void Signal() { |
@@ -267,9 +271,10 @@ TEST_F(ConditionVariablePerfTest, EventPingPong) { |
// way to force a context switch, we should use that instead. |
class PthreadEvent { |
public: |
- PthreadEvent(bool manual_reset, bool initially_signaled) { |
- DCHECK(!manual_reset); |
- DCHECK(!initially_signaled); |
+ PthreadEvent(WaitableEvent::ResetPolicy reset_policy, |
+ WaitableEvent::InitialState initial_state) { |
+ DCHECK_EQ(WaitableEvent::ResetPolicy::AUTOMATIC, reset_policy); |
+ DCHECK_EQ(WaitableEvent::InitialState::NOT_SIGNALED, initial_state); |
pthread_mutex_init(&mutex_, 0); |
pthread_cond_init(&cond_, 0); |
signaled_ = false; |