From dcf3f40cc77af95cfae4e8a1f07307c46d0ab75d Mon Sep 17 00:00:00 2001 From: barbieri Date: Fri, 23 Jan 2009 22:21:04 +0000 Subject: [PATCH] evas preload: do not lock mutex aready locked. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@38749 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/cache/evas_cache_image.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c index d2d155d..a84b26f 100644 --- a/src/lib/cache/evas_cache_image.c +++ b/src/lib/cache/evas_cache_image.c @@ -303,9 +303,8 @@ _evas_cache_image_entry_surface_alloc(Evas_Cache_Image *cache, #ifdef BUILD_ASYNC_PRELOAD static void -_evas_cache_image_async_call(Image_Entry *im) +_evas_cache_image_async_call__unlocked(Image_Entry *im) { - pthread_mutex_lock(&mutex); while (im->targets) { Evas_Cache_Target *tmp = im->targets; @@ -315,6 +314,13 @@ _evas_cache_image_async_call(Image_Entry *im) im->targets = (Evas_Cache_Target*) eina_inlist_remove(EINA_INLIST_GET(im->targets), EINA_INLIST_GET(im->targets)); free(tmp); } +} + +static void +_evas_cache_image_async_call(Image_Entry *im) +{ + pthread_mutex_lock(&mutex); + _evas_cache_image_async_call__unlocked(im); pthread_mutex_unlock(&mutex); } @@ -407,7 +413,7 @@ _evas_cache_image_entry_preload_remove(Image_Entry *ie, const void *target) } } } else { - _evas_cache_image_async_call(ie); + _evas_cache_image_async_call__unlocked(ie); while (ie->targets) { -- 2.7.4