[EGIT] [core/efl] master 01/02: evas image preload - fix race condition that stops preloads

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0690d47880dce56bb7d7393f0f8f763c18034fd1

commit 0690d47880dce56bb7d7393f0f8f763c18034fd1
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Fri Jan 6 16:35:09 2017 +0900

    evas image preload - fix race condition that stops preloads
    
    so if you queue a preload while a cancel is still pending the new
    preload never happens. this fixes that. now it does but checking for
    leftover tasks in the cancel cb and rescheduling a preload thread.
    
    @fix
---
 src/lib/evas/cache/evas_cache_image.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/cache/evas_cache_image.c 
b/src/lib/evas/cache/evas_cache_image.c
index 9b45053..3a3d47b 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -469,6 +469,20 @@ _evas_cache_image_async_cancel(void *data)
         cache = ie->cache;
      }
    if (cache) evas_cache_image_flush(cache);
+   SLKL(ie->lock_task);
+   if (ie->targets)
+     {
+        ie->cache->preload = eina_list_append(ie->cache->preload, ie);
+        ie->flags.pending = 0;
+        LKL(wakeup);
+        ie->flags.preload_pending = 1;
+        LKU(wakeup);
+        ie->preload = evas_preload_thread_run(_evas_cache_image_async_heavy,
+                                              _evas_cache_image_async_end,
+                                              _evas_cache_image_async_cancel,
+                                              ie);
+     }
+   SLKU(ie->lock_task);
 }
 
 // note - preload_add assumes a target is ONLY added ONCE to the image
@@ -1372,8 +1386,26 @@ evas_cache_image_preload_data(Image_Entry *im, const Eo 
*target,
 {
    RGBA_Image *img = (RGBA_Image *)im;
 
-   if (((im->flags.loaded) && (img->image.data)) || (im->flags.textured && 
!im->flags.updated_data))
+   if (((int)im->w > 0) && ((int)im->h > 0) &&
+       (((im->flags.loaded) && (img->image.data)) ||
+        (im->flags.textured && !im->flags.updated_data)))
      {
+        Evas_Cache_Target *tmp;
+
+        while ((tmp = im->targets))
+          {
+             im->targets = (Evas_Cache_Target *)
+               eina_inlist_remove(EINA_INLIST_GET(im->targets),
+                                  EINA_INLIST_GET(im->targets));
+             if (tmp->simple_cb)
+               {
+                  if (!tmp->delete_me)
+                    {
+                       tmp->simple_cb(tmp->simple_data);
+                    }
+               }
+             free(tmp);
+          }
         evas_object_inform_call_image_preloaded((Evas_Object*)target);
         return;
      }

--