diff options
Diffstat (limited to 'src/corelib/thread/qwaitcondition_p.h')
-rw-r--r-- | src/corelib/thread/qwaitcondition_p.h | 106 |
1 files changed, 10 insertions, 96 deletions
diff --git a/src/corelib/thread/qwaitcondition_p.h b/src/corelib/thread/qwaitcondition_p.h index e82f832817..14833d56ef 100644 --- a/src/corelib/thread/qwaitcondition_p.h +++ b/src/corelib/thread/qwaitcondition_p.h @@ -7,10 +7,9 @@ // W A R N I N G // ------------- // -// This file is not part of the Qt API. It exists for the convenience -// of qmutex.cpp, qmutex_unix.cpp, and qmutex_win.cpp. This header -// file may change from version to version without notice, or even be -// removed. +// This file is not part of the Qt API. It exists for the convenience of +// qmutex.cpp and qmutex_unix.cpp. This header file may change from version to +// version without notice, or even be removed. // // We mean it. // @@ -23,101 +22,16 @@ #include <condition_variable> #include <mutex> -// There's no feature macro for C++11 std::mutex, so we use the C++14 one -// for shared_mutex to detect it. -// Needed for: MinGW without gthreads, Integrity -#if __has_include(<shared_mutex>) -# include <shared_mutex> -#endif - QT_BEGIN_NAMESPACE namespace QtPrivate { - -#if !defined(__cpp_lib_shared_timed_mutex) - -enum class cv_status { no_timeout, timeout }; -class condition_variable; - -class mutex : private QMutex -{ - friend class QtPrivate::condition_variable; - -public: - // all special member functions are ok! - // do not expose the (QMutex::Recursive) ctor - // don't use 'using QMutex::lock;' etc as those have the wrong noexcept - - void lock() { return QMutex::lock(); } - void unlock() { return QMutex::unlock(); } - bool try_lock() { return QMutex::tryLock(); } -}; - -class condition_variable : private QWaitCondition -{ -public: - // all special member functions are ok! - - void notify_one() { QWaitCondition::wakeOne(); } - void notify_all() { QWaitCondition::wakeAll(); } - - void wait(std::unique_lock<QtPrivate::mutex> &lock) { QWaitCondition::wait(lock.mutex()); } - template <class Predicate> - void wait(std::unique_lock<QtPrivate::mutex> &lock, Predicate p) - { - while (!p()) - wait(lock); - } - - template <typename Rep, typename Period> - cv_status wait_for(std::unique_lock<QtPrivate::mutex> &lock, - const std::chrono::duration<Rep, Period> &d) - { - return QWaitCondition::wait(lock.mutex(), QDeadlineTimer{d}) - ? cv_status::no_timeout - : cv_status::timeout; - } - template <typename Rep, typename Period, typename Predicate> - bool wait_for(std::unique_lock<QtPrivate::mutex> &lock, - const std::chrono::duration<Rep, Period> &d, Predicate p) - { - const auto timer = QDeadlineTimer{d}; - while (!p()) { - if (!QWaitCondition::wait(lock.mutex(), timer)) - return p(); - } - return true; - } - - template <typename Clock, typename Duration> - cv_status wait_until(std::unique_lock<QtPrivate::mutex> &lock, - const std::chrono::time_point<Clock, Duration> &t) - { - return QWaitCondition::wait(lock.mutex(), QDeadlineTimer{t}) - ? cv_status::no_timeout - : cv_status::timeout; - } - - template <typename Clock, typename Duration, typename Predicate> - bool wait_until(std::unique_lock<QtPrivate::mutex> &lock, - const std::chrono::time_point<Clock, Duration> &t, Predicate p) - { - const auto timer = QDeadlineTimer{t}; - while (!p()) { - if (!QWaitCondition::wait(lock.mutex(), timer)) - return p(); - } - return true; - } - -}; - -#else // C++11 threads - -using mutex = std::mutex; -using condition_variable = std::condition_variable; - -#endif // C++11 threads +// Ideal alignment for mutex and condition_variable: it's the hardware +// interference size (size of a cache line) if the types are likely to contain +// the actual data structures, otherwise just that of a pointer. +static constexpr quintptr IdealMutexAlignment = + sizeof(std::mutex) > sizeof(void *) && + sizeof(std::condition_variable) > sizeof(void *) ? + 64 : alignof(void*); } // namespace QtPrivate |