luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

GPeriodic: pass microseconds to the tick functions

Browse Source 
...instead of milliticks, which nobody really cares to understand.
This commit is contained in:
Ryan Lortie
2010-10-21 01:37:23 +02:00
parent 5400b0b38c
commit 8690984cea
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gio/gperiodic.c
View File

@@ -111,7 +111,7 @@ static guint g_periodic_tick;
static guint g_periodic_repair; static guint g_periodic_repair;
static guint64 static guint64
g_periodic_get_milliticks (GPeriodic *periodic) g_periodic_get_microticks (GPeriodic *periodic)
{ {
guint64 microticks; guint64 microticks;
GTimeVal timeval; GTimeVal timeval;
@@ -123,7 +123,7 @@ g_periodic_get_milliticks (GPeriodic *periodic)
microticks += timeval.tv_usec; microticks += timeval.tv_usec;
microticks *= periodic->hz; microticks *= periodic->hz;
return microticks / 1000; return microticks;
} }
static void static void
@@ -133,16 +133,19 @@ g_periodic_run (GPeriodic *periodic)
if (periodic->ticks) if (periodic->ticks)
{ {
guint64 microseconds;
GSList *iter; GSList *iter;
microseconds = periodic->last_run / periodic->hz;
periodic->in_tick = TRUE; periodic->in_tick = TRUE;
for (iter = periodic->ticks; iter; iter = iter->next) for (iter = periodic->ticks; iter; iter = iter->next)
{ {
GPeriodicTick *tick = iter->data; GPeriodicTick *tick = iter->data;
tick->callback (periodic, periodic->last_run, tick->user_data); tick->callback (periodic, microseconds, tick->user_data);
} }
g_signal_emit (periodic, g_periodic_tick, 0, periodic->last_run); g_signal_emit (periodic, g_periodic_tick, 0, microseconds);
periodic->in_tick = FALSE; periodic->in_tick = FALSE;
} }
@@ -180,8 +183,8 @@ g_periodic_prepare (GSource *source,
{ {
gint64 remaining; gint64 remaining;
remaining = periodic->last_run + 1000 - remaining = periodic->last_run + 1000000 -
g_periodic_get_milliticks (periodic); g_periodic_get_microticks (periodic);
if (remaining > 0) if (remaining > 0)
/* It's too soon. Wait some more before running. */ /* It's too soon. Wait some more before running. */
@@ -192,7 +195,7 @@ g_periodic_prepare (GSource *source,
* that not enough time has passed and want to sleep again, so * that not enough time has passed and want to sleep again, so
* save ourselves the future bother. * save ourselves the future bother.
*/ */
*timeout = (remaining + periodic->hz - 1) / periodic->hz; *timeout = (remaining + periodic->hz - 1) / periodic->hz / 1000;
return FALSE; return FALSE;
} }
@@ -220,10 +223,10 @@ g_periodic_check (GSource *source)
if ((periodic->ticks || periodic->repairs) && !periodic->blocked) if ((periodic->ticks || periodic->repairs) && !periodic->blocked)
/* We need to run. */ /* We need to run. */
{ {
guint64 now = g_periodic_get_milliticks (periodic); guint64 now = g_periodic_get_microticks (periodic);
/* Run if it's not too soon. */ /* Run if it's not too soon. */
return !(now < periodic->last_run + 1000); return !(now < periodic->last_run + 1000000);
} }
else else
@@ -256,12 +259,12 @@ g_periodic_dispatch (GSource *source,
* *
* - resets our stride if we missed a frame * - resets our stride if we missed a frame
*/ */
now = g_periodic_get_milliticks (periodic); now = g_periodic_get_microticks (periodic);
elapsed_ticks = (now - periodic->last_run) / 1000; elapsed_ticks = (now - periodic->last_run) / 1000000;
g_assert (elapsed_ticks > 0); g_assert (elapsed_ticks > 0);
if G_LIKELY (elapsed_ticks == 1) if G_LIKELY (elapsed_ticks == 1)
periodic->last_run += 1000; periodic->last_run += 1000000;
else else
periodic->last_run = now; periodic->last_run = now;
@@ -416,7 +419,7 @@ g_periodic_unblock (GPeriodic *periodic)
if (--periodic->blocked) if (--periodic->blocked)
{ {
periodic->last_run = g_periodic_get_milliticks (periodic); periodic->last_run = g_periodic_get_microticks (periodic);
g_periodic_run (periodic); g_periodic_run (periodic);
} }
} }