diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-07-18 14:54:58 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2024-08-21 12:22:52 +0200 |
| commit | f4d76853b9d921e3645295f9bebc39eb73661e67 (patch) | |
| tree | 37f3a117d17012958ae5de39a47e7a99700bff61 /core/os/condition_variable.h | |
| parent | df23858488098086da20c67d9fc62f7ffb3d528c (diff) | |
| download | redot-engine-f4d76853b9d921e3645295f9bebc39eb73661e67.tar.gz | |
WorkerThreadPool (plus friends): Overhaul unlock allowance zones
This fixes a rare but possible deadlock, maybe due to undefined behavior. The new implementation is safer, at the cost of some added boilerplate.
Diffstat (limited to 'core/os/condition_variable.h')
| -rw-r--r-- | core/os/condition_variable.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/os/condition_variable.h b/core/os/condition_variable.h index fa1355e98c..c819fa6b40 100644 --- a/core/os/condition_variable.h +++ b/core/os/condition_variable.h @@ -32,6 +32,7 @@ #define CONDITION_VARIABLE_H #include "core/os/mutex.h" +#include "core/os/safe_binary_mutex.h" #ifdef THREADS_ENABLED @@ -56,7 +57,12 @@ class ConditionVariable { public: template <typename BinaryMutexT> _ALWAYS_INLINE_ void wait(const MutexLock<BinaryMutexT> &p_lock) const { - condition.wait(const_cast<THREADING_NAMESPACE::unique_lock<THREADING_NAMESPACE::mutex> &>(p_lock.lock)); + condition.wait(const_cast<THREADING_NAMESPACE::unique_lock<THREADING_NAMESPACE::mutex> &>(p_lock._get_lock())); + } + + template <int Tag> + _ALWAYS_INLINE_ void wait(const MutexLock<SafeBinaryMutex<Tag>> &p_lock) const { + condition.wait(const_cast<THREADING_NAMESPACE::unique_lock<THREADING_NAMESPACE::mutex> &>(p_lock.mutex._get_lock())); } _ALWAYS_INLINE_ void notify_one() const { |