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

ecore: prevent race condition when using sync call after begin/end. 

SVN revision: 63407
This commit is contained in:
Cedric BAIL 2011-09-15 11:15:46 +00:00
parent 8cc23a119e
commit 8e9fbe5662
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/ecore/src/lib/ecore/ecore.c
View File

@ -79,6 +79,8 @@ static Eina_Lock _thread_safety;
static int _thread_loop = 0;
static Eina_Lock _thread_mutex;
static Eina_Condition _thread_cond;
static Eina_Lock _thread_feedback_mutex;
static Eina_Condition _thread_feedback_cond;
Eina_Lock _ecore_main_loop_lock;
int _ecore_main_lock_count;
@ -159,6 +161,8 @@ ecore_init(void)
eina_lock_new(&_thread_safety);
eina_lock_new(&_thread_mutex);
eina_condition_new(&_thread_cond, &_thread_mutex);
eina_lock_new(&_thread_feedback_mutex);
eina_condition_new(&_thread_feedback_cond, &_thread_feedback_mutex);
_thread_call = ecore_pipe_add(_thread_callback, NULL);
eina_lock_new(&_ecore_main_loop_lock);
@ -208,6 +212,10 @@ ecore_shutdown(void)
ecore_pipe_del(_thread_call);
eina_lock_free(&_thread_safety);
eina_condition_free(&_thread_cond);
eina_lock_free(&_thread_mutex);
eina_condition_free(&_thread_feedback_cond);
eina_lock_free(&_thread_feedback_mutex);
if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
_ecore_poller_shutdown();
@ -371,6 +379,10 @@ ecore_thread_main_loop_end(void)
eina_condition_broadcast(&_thread_cond);
eina_lock_take(&_thread_feedback_mutex);
eina_condition_wait(&_thread_feedback_cond);
eina_lock_release(&_thread_feedback_mutex);
return 0;
}
@ -636,14 +648,17 @@ _thread_callback(void *data __UNUSED__,
{
if (call->suspend)
{
eina_lock_take(&_thread_mutex);
eina_condition_broadcast(&call->c);
eina_lock_take(&_thread_mutex);
eina_condition_wait(&_thread_cond);
eina_lock_release(&_thread_mutex);
eina_main_loop_define();
eina_condition_broadcast(&_thread_feedback_cond);
_thread_safe_cleanup(call);
free(call);
}