kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: fix preload thread deadlock issue 

Summary: Wrong condition makes deadlock issue.

Reviewers: jpeg, jypark

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D3742

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
jiin.moon 2016-03-04 15:57:50 -08:00 committed by Cedric BAIL
parent 48461bb946
commit 41b8a320a0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/cache/evas_cache_image.c vendored
View File

@ -330,6 +330,7 @@ _evas_cache_image_async_heavy(void *data)
current = data;
SLKL(current->lock);
current->flags.load_worked = 0;
pchannel = current->channel;
current->channel++;
cache = current->cache;
@ -373,6 +374,7 @@ _evas_cache_image_async_heavy(void *data)
current->flags.preload_done = 0;
}
SLKU(current->lock_cancel);
current->flags.load_worked = 1;
SLKU(current->lock);
}
@ -1160,7 +1162,7 @@ evas_cache_image_load_data(Image_Entry *im)
evas_async_events_process();
LKL(wakeup);
while (im->preload)
while (!im->flags.load_worked)
{
eina_condition_wait(&cond_wakeup);
LKU(wakeup);

1
src/lib/evas/include/evas_common_private.h
View File

@ -568,6 +568,7 @@ struct _Image_Entry_Flags
Eina_Bool updated_data : 1;
Eina_Bool flipped : 1;
Eina_Bool textured : 1;
Eina_Bool load_worked : 1;
};
struct _Image_Entry_Frame