From ebf3735754d015dfda72930a676b8b43f0614086 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Wed, 18 Mar 2015 08:25:15 +0100 Subject: [PATCH] Retire ConditionVariable Now that we use spinlocks everywhere and don't put threads to sleep while idle, we can use the slower (but no more in hot path) std::condition_variable_any instead of our homwgrown ConditionVariable struct. Verified fo rno regression at STC with 7 threads: ELO: -0.66 +-2.7 (95%) LOS: 31.8% Total: 20000 W: 3210 L: 3248 D: 13542 No functional change --- src/thread_win32.h | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/thread_win32.h b/src/thread_win32.h index a3abd65c..28c899dc 100644 --- a/src/thread_win32.h +++ b/src/thread_win32.h @@ -57,29 +57,7 @@ private: CRITICAL_SECTION cs; }; -struct ConditionVariable { - ConditionVariable() { hn = CreateEvent(0, FALSE, FALSE, 0); } - ~ConditionVariable() { CloseHandle(hn); } - void notify_one() { SetEvent(hn); } - - void wait(std::unique_lock& lk) { - lk.unlock(); - WaitForSingleObject(hn, INFINITE); - lk.lock(); - } - - void wait_for(std::unique_lock& lk, const std::chrono::milliseconds& ms) { - lk.unlock(); - WaitForSingleObject(hn, ms.count()); - lk.lock(); - } - - template - void wait(std::unique_lock& lk, Predicate p) { while (!p()) this->wait(lk); } - -private: - HANDLE hn; -}; +typedef std::condition_variable_any ConditionVariable; #else // Default case: use STL classes -- 2.39.2