From 08ac4d3d71dee9fc4ec7f878e57de59c87115280 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 11 May 2020 10:16:29 +0200 Subject: Fix T76553: Blender Freezes When Playing Back Animation In some cases blender could freeze. When threads are blocked (waiting for other tasks completion) the scheduler can let the thread perform a different task. If this task wants a write-lock for something that was read-locked in the stack a dead lock will happen. For task pools every task is isolated. For range tasks the inner loop will be isolated. The implementation is limited as isolation in TBB uses functors which are tricky to add to a C API. We decided to start with a simple and adapt were we need to. During testing we came to this setup as it was reliable (we weren't able to let it freeze or crash) and didn't had noticeable performance impact. Reviewed By: Brecht van Lommel Differential Revision: https://developer.blender.org/D7688 --- source/blender/blenlib/intern/task_pool.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/blenlib/intern/task_pool.cc') diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index c4d60673492..42b635afcf1 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -114,7 +114,7 @@ class Task { /* Execute task. */ void operator()() const { - run(pool, taskdata); + tbb::this_task_arena::isolate([this] { run(pool, taskdata); }); } }; -- cgit v1.2.3