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

ecore: Wake main loop immediately on zero sleep 

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>

SVN revision: 61268
This commit is contained in:
Mike McCormack 2011-07-12 06:11:14 +00:00 committed by Mike McCormack
parent 87b27ee044
commit 92723a2ee5
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/ecore/src/lib/ecore/ecore_main.c
View File

@ -483,7 +483,7 @@ static inline int _ecore_main_fdh_glib_mark_active(void)
static gboolean
_ecore_main_gsource_prepare(GSource *source __UNUSED__, gint *next_time)
{
gboolean running;
gboolean ready = FALSE;
in_main_loop++;
@ -500,8 +500,7 @@ _ecore_main_gsource_prepare(GSource *source __UNUSED__, gint *next_time)
while (_ecore_signal_count_get()) _ecore_signal_call();
/* don't check fds if somebody quit */
running = g_main_loop_is_running(ecore_main_loop);
if (running)
if (g_main_loop_is_running(ecore_main_loop))
{
/* only set idling state in dispatch */
if (ecore_idling && !_ecore_idler_exist() && !_ecore_event_exist())
@ -510,7 +509,7 @@ _ecore_main_gsource_prepare(GSource *source __UNUSED__, gint *next_time)
{
int r = -1;
double t = _ecore_timer_next_get();
if (timer_fd >= 0)
if (timer_fd >= 0 && t > 0.0)
{
struct itimerspec ts;
@ -536,23 +535,33 @@ _ecore_main_gsource_prepare(GSource *source __UNUSED__, gint *next_time)
}
}
if (r == -1)
*next_time = ceil(t * 1000.0);
{
*next_time = ceil(t * 1000.0);
if (t == 0.0)
ready = TRUE;
}
}
else
*next_time = -1;
}
else
*next_time = 0;
{
*next_time = 0;
if (_ecore_event_exist())
ready = TRUE;
}
if (fd_handlers_with_prep)
_ecore_main_prepare_handlers();
}
else
ready = TRUE;
in_main_loop--;
INF("leave, timeout = %d", *next_time);
/* ready if we're not running (about to quit) */
return !running;
return ready;
}
static gboolean