[Bf-blender-cvs] [e8a8bb67fce] master: Cleanup: Correct order of guard and lock in moviecache_valfree

Jesse Yurkovich noreply at git.blender.org
Sat Nov 13 06:46:11 CET 2021


Commit: e8a8bb67fcefa5e935214e1af1ec3da38465dda1
Author: Jesse Yurkovich
Date:   Fri Nov 12 20:47:26 2021 -0800
Branches: master
https://developer.blender.org/rBe8a8bb67fcefa5e935214e1af1ec3da38465dda1

Cleanup: Correct order of guard and lock in moviecache_valfree

Fix own mistake in rB7061d1e39fe

In my attempt to quickly address T92838, along with the original bug, I
made a nonsensical choice to use the limiter lock to guard the check
against the cache item itself. While harmless, it is not necessary and
semantically wrong / potentially confusing to future readers of the code.

Differential Revision: https://developer.blender.org/D13122

===================================================================

M	source/blender/imbuf/intern/moviecache.c

===================================================================

diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index 1bc0a4e628d..8923ba98e08 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -122,11 +122,11 @@ static void moviecache_valfree(void *val)
 
   PRINT("%s: cache '%s' free item %p buffer %p\n", __func__, cache->name, item, item->ibuf);
 
-  BLI_mutex_lock(&limitor_lock);
   if (item->c_handle) {
+    BLI_mutex_lock(&limitor_lock);
     MEM_CacheLimiter_unmanage(item->c_handle);
+    BLI_mutex_unlock(&limitor_lock);
   }
-  BLI_mutex_unlock(&limitor_lock);
 
   if (item->ibuf) {
     IMB_freeImBuf(item->ibuf);



More information about the Bf-blender-cvs mailing list