From a42021655c3218c64272b648438197247ec7f6a9 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 29 Dec 2016 11:40:00 +0100 Subject: [PATCH] thread/Cond: make the integer-based timed_wait() overload private Make sure this deprecated API is not used. --- src/thread/PosixCond.hxx | 2 ++ src/thread/WindowsCond.hxx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/thread/PosixCond.hxx b/src/thread/PosixCond.hxx index 2428aa5c7..208ba1ed5 100644 --- a/src/thread/PosixCond.hxx +++ b/src/thread/PosixCond.hxx @@ -74,6 +74,7 @@ public: pthread_cond_wait(&cond, &mutex.mutex); } +private: bool timed_wait(PosixMutex &mutex, unsigned timeout_ms) { struct timeval now; gettimeofday(&now, nullptr); @@ -90,6 +91,7 @@ public: return pthread_cond_timedwait(&cond, &mutex.mutex, &ts) == 0; } +public: bool timed_wait(PosixMutex &mutex, std::chrono::steady_clock::duration timeout) { auto timeout_ms = std::chrono::duration_cast(timeout).count(); diff --git a/src/thread/WindowsCond.hxx b/src/thread/WindowsCond.hxx index 0419ee3c3..04620dbaf 100644 --- a/src/thread/WindowsCond.hxx +++ b/src/thread/WindowsCond.hxx @@ -56,11 +56,13 @@ public: WakeAllConditionVariable(&cond); } +private: bool timed_wait(CriticalSection &mutex, DWORD timeout_ms) { return SleepConditionVariableCS(&cond, &mutex.critical_section, timeout_ms); } +public: bool timed_wait(CriticalSection &mutex, std::chrono::steady_clock::duration timeout) { auto timeout_ms = std::chrono::duration_cast(timeout).count();