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

ecore - animator - new thread timer animator - fiux shutdown 

expedite actualyl shuts ecore down - fix eina magic complaints with
safe shutdown.
This commit is contained in:
Carsten Haitzler 2015-07-06 18:00:19 +09:00
parent 45cef3e0a5
commit 851e1b5cba
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib/ecore/ecore_anim.c
View File

@ -110,25 +110,18 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
} }
else else
{ {
do DBG("poll...");
msg = eina_thread_queue_poll(timer_thq, &ref);
if (msg)
{ {
DBG("poll..."); tick = msg->val;
msg = eina_thread_queue_poll(timer_thq, &ref); eina_thread_queue_wait_done(timer_thq, ref);
if (msg)
{
tick = msg->val;
eina_thread_queue_wait_done(timer_thq, ref);
}
} }
while (msg);
} }
DBG("tick = %i", tick); DBG("tick = %i", tick);
if (tick == -1) if (tick == -1)
{ {
timer_thread = NULL; goto done;
eina_thread_queue_free(timer_thq);
timer_thq = NULL;
return;
} }
else if (tick) else if (tick)
{ {
@ -139,6 +132,10 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
_timer_send_time(t0 - d + animators_frametime); _timer_send_time(t0 - d + animators_frametime);
} }
} }
done:
if (timer_thq) eina_thread_queue_free(timer_thq);
timer_thq = NULL;
timer_thread = NULL;
} }
static void static void
@ -158,6 +155,14 @@ _timer_tick_notify(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED, voi
free(msg); free(msg);
} }
static void
_timer_tick_finished(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED)
{
timer_thread = NULL;
if (timer_thq) eina_thread_queue_free(timer_thq);
timer_thq = NULL;
}
static void static void
_timer_tick_begin(void) _timer_tick_begin(void)
{ {
@ -166,7 +171,9 @@ _timer_tick_begin(void)
timer_thq = eina_thread_queue_new(); timer_thq = eina_thread_queue_new();
timer_thread = ecore_thread_feedback_run(_timer_tick_core, timer_thread = ecore_thread_feedback_run(_timer_tick_core,
_timer_tick_notify, _timer_tick_notify,
NULL, NULL, NULL, EINA_TRUE); _timer_tick_finished,
_timer_tick_finished,
NULL, EINA_TRUE);
} }
timer_event_is_busy = 1; timer_event_is_busy = 1;
_tick_send(1); _tick_send(1);
@ -183,8 +190,14 @@ _timer_tick_end(void)
static void static void
_timer_tick_quit(void) _timer_tick_quit(void)
{ {
int i;
if (!timer_thq) return; if (!timer_thq) return;
_tick_send(-1); _tick_send(-1);
for (i = 0; (i < 500) && (timer_thread); i++)
{
usleep(1000);
}
} }
static Eina_Bool static Eina_Bool