[EGIT] [core/efl] master 01/01: ecore_evas buffer: fix a deadlock issue.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2e37d2f30f0e9cee3b71a014908f445c723317aa

commit 2e37d2f30f0e9cee3b71a014908f445c723317aa
Author: Hermet Park <hermetp...@gmail.com>
Date:   Mon Jul 22 17:14:10 2019 +0900

    ecore_evas buffer: fix a deadlock issue.
    
    We encountered a deadlock case in ecore_evas_image_object in 
ecore_evas_buffer
    that only happens if the ecore_evas_buffer has nothing changed to render,
    though it's triggered to rendering.
    
    See this normal scenario that is working fine as our intention.
    
    being ecore_evas_render()
    ...
     -> ecore_evas_buffer_prepare()
         -> evas_object_image_data_get()
             -> increment lock by backend engine. (egl/tbm ...)
     -> render()
         -> render_post()
            -> _ecore_evas_buffer_update_image()
                -> evas_object_image_data_set()
                   ->decrement lock by backend engine (egl/tbm ...)
    ...
    end ecore_evas_render()
    
    The problem is, if the ecore_evas_buffer canvas doesn't changed at all,
    render post will be skipped, it could lose the chance to unlock the image 
data.
    Now the host can't render anymore since it's image source lost the lock.
    
    @fix
---
 src/lib/ecore_evas/ecore_evas_buffer.c | 9 +++++++--
 src/lib/ecore_evas/ecore_evas_buffer.h | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c 
b/src/lib/ecore_evas/ecore_evas_buffer.c
index 147e09070b..19422366b6 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -176,14 +176,17 @@ _ecore_evas_buffer_prepare(Ecore_Evas *ee)
         evas_object_image_size_get(bdata->image, &w, &h);
         if ((w != ee->w) || (h != ee->h))
           _ecore_evas_resize(ee, w, h);
-        bdata->pixels = evas_object_image_data_get(bdata->image, 1);
+        if (evas_changed_get(ee->evas) && !bdata->lock_data)
+          {
+             bdata->pixels = evas_object_image_data_get(bdata->image, 1);
+             bdata->lock_data = EINA_TRUE;
+          }
      }
    else if (bdata->resized)
      {
         if (ee->func.fn_resize) ee->func.fn_resize(ee);
         bdata->resized = 0;
      }
-
    return EINA_TRUE;
 }
 
@@ -200,6 +203,8 @@ _ecore_evas_buffer_update_image(void *data, Evas *e 
EINA_UNUSED, void *event_inf
    EINA_LIST_FOREACH(post->updated_area, l, r)
      evas_object_image_data_update_add(bdata->image,
                                        r->x, r->y, r->w, r->h);
+
+   bdata->lock_data = EINA_FALSE;
 }
 
 EAPI int
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.h 
b/src/lib/ecore_evas/ecore_evas_buffer.h
index 1249c380f4..188072a18e 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.h
+++ b/src/lib/ecore_evas/ecore_evas_buffer.h
@@ -9,7 +9,7 @@ struct _Ecore_Evas_Engine_Buffer_Data {
    void  (*free_func) (void *data, void *pix);
    void *(*alloc_func) (void *data, int size);
    void *data;
-   Eina_Bool in_render : 1;
+   Eina_Bool lock_data : 1;
    Eina_Bool resized : 1;
 };
 

--