diff options
author | Jacques Lucke <jacques@blender.org> | 2022-11-06 17:45:45 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2022-11-06 17:45:45 +0300 |
commit | 37ca6e4fd10fe8d42b8644ea354294b043d212aa (patch) | |
tree | f8d916fdffa517ab3a204fa76202b387d7d5b9bd /source/blender/blenlib/intern/lazy_threading.cc | |
parent | a8865f3402544808e0d89faa661b463058960bbd (diff) | |
parent | 25c6444bad25fae14d1e8dae5d312e0511fcfb3f (diff) |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'source/blender/blenlib/intern/lazy_threading.cc')
-rw-r--r-- | source/blender/blenlib/intern/lazy_threading.cc | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/source/blender/blenlib/intern/lazy_threading.cc b/source/blender/blenlib/intern/lazy_threading.cc index 803fd81a96d..4f6d3a75ecc 100644 --- a/source/blender/blenlib/intern/lazy_threading.cc +++ b/source/blender/blenlib/intern/lazy_threading.cc @@ -1,30 +1,50 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include "BLI_lazy_threading.hh" +#include "BLI_stack.hh" #include "BLI_vector.hh" namespace blender::lazy_threading { /** - * This is a #RawVector so that it can be destructed after Blender checks for memory leaks. + * This uses a "raw" stack and vector so that it can be destructed after Blender checks for memory + * leaks. A new list of receivers is created whenever an isolated region is entered to avoid + * deadlocks. */ -thread_local RawVector<FunctionRef<void()>, 0> hint_receivers; +using HintReceivers = RawStack<RawVector<FunctionRef<void()>, 0>, 0>; +thread_local HintReceivers hint_receivers = []() { + HintReceivers receivers; + /* Make sure there is always at least one vector. */ + receivers.push_as(); + return receivers; +}(); void send_hint() { - for (const FunctionRef<void()> &fn : hint_receivers) { + for (const FunctionRef<void()> &fn : hint_receivers.peek()) { fn(); } } HintReceiver::HintReceiver(const FunctionRef<void()> fn) { - hint_receivers.append(fn); + hint_receivers.peek().append(fn); } HintReceiver::~HintReceiver() { - hint_receivers.pop_last(); + hint_receivers.peek().pop_last(); +} + +ReceiverIsolation::ReceiverIsolation() +{ + hint_receivers.push_as(); +} + +ReceiverIsolation::~ReceiverIsolation() +{ + BLI_assert(hint_receivers.peek().is_empty()); + hint_receivers.pop(); } } // namespace blender::lazy_threading |