luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GTimeout: simplify math for 'seconds' case

Browse Source 
The code was designed to deal with any granularity of timer and due to
the use of GTimeVal/GTimeSpec, the math for this gets extremely
confusing.

From a practical standpoint, we only ever have a granularity of seconds.

Take advantage of that fact in the code and vastly simplify the math.
This commit is contained in:
Ryan Lortie 2010-11-01 13:31:37 -04:00
parent b6854efdb9
commit d9f5ab56c3
1 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
glib/gmain.c
View File

@ -290,7 +290,7 @@ struct _GTimeoutSource
GSource source; GSource source;
GTimeSpec expiration; GTimeSpec expiration;
guint interval; guint interval;
guint granularity; gboolean seconds;
}; };
struct _GChildWatchSource struct _GChildWatchSource
@ -393,8 +393,6 @@ static gint child_watch_wake_up_pipe[2] = {0, 0};
G_LOCK_DEFINE_STATIC (main_context_list); G_LOCK_DEFINE_STATIC (main_context_list);
static GSList *main_context_list = NULL; static GSList *main_context_list = NULL;
static gint timer_perturb = -1;
GSourceFuncs g_timeout_funcs = GSourceFuncs g_timeout_funcs =
{ {
g_timeout_prepare, g_timeout_prepare,
@ -3575,7 +3573,11 @@ g_timeout_set_expiration (GTimeoutSource *timeout_source,
timeout_source->expiration.tv_nsec -= 1000000000; timeout_source->expiration.tv_nsec -= 1000000000;
timeout_source->expiration.tv_sec++; timeout_source->expiration.tv_sec++;
} }
if (timer_perturb==-1) if (timeout_source->seconds)
{
static gint timer_perturb = -1;
if (timer_perturb == -1)
{ {
/* /*
* we want a per machine/session unique 'random' value; try the dbus * we want a per machine/session unique 'random' value; try the dbus
@ -3586,43 +3588,21 @@ g_timeout_set_expiration (GTimeoutSource *timeout_source,
if (!session_bus_address) if (!session_bus_address)
session_bus_address = g_getenv ("HOSTNAME"); session_bus_address = g_getenv ("HOSTNAME");
if (session_bus_address) if (session_bus_address)
timer_perturb = ABS ((gint) g_str_hash (session_bus_address)); timer_perturb = ABS ((gint) g_str_hash (session_bus_address)) % 1000000;
else else
timer_perturb = 0; timer_perturb = 0;
} }
if (timeout_source->granularity)
{
gint remainder;
gint gran; /* in nsecs */
gint perturb;
gran = timeout_source->granularity * 1000000; /* We want the microseconds part of the timeout to land on the
perturb = timer_perturb % gran; * 'timer_perturb' mark, but we need to make sure we don't try to
/* * set the timeout in the past. We do this by ensuring that we
* We want to give each machine a per machine pertubation; * always only *increase* the expiration time by adding a full
* shift time back first, and forward later after the rounding * second in the case that the microsecond portion decreases.
*/ */
if (timer_perturb * 1000 < timeout_source->expiration.tv_nsec)
timeout_source->expiration.tv_nsec -= perturb;
if (timeout_source->expiration.tv_nsec < 0)
{
timeout_source->expiration.tv_nsec += 1000000000;
timeout_source->expiration.tv_sec--;
}
remainder = timeout_source->expiration.tv_nsec % gran;
if (remainder >= gran/4) /* round up */
timeout_source->expiration.tv_nsec += gran;
timeout_source->expiration.tv_nsec -= remainder;
/* shift back */
timeout_source->expiration.tv_nsec += perturb;
/* the rounding may have overflown tv_nsec */
while (timeout_source->expiration.tv_nsec > 1000000000)
{
timeout_source->expiration.tv_nsec -= 1000000000;
timeout_source->expiration.tv_sec++; timeout_source->expiration.tv_sec++;
}
timeout_source->expiration.tv_nsec = timer_perturb * 1000;
} }
} }
@ -3770,8 +3750,8 @@ g_timeout_source_new_seconds (guint interval)
GTimeoutSource *timeout_source = (GTimeoutSource *)source; GTimeoutSource *timeout_source = (GTimeoutSource *)source;
GTimeSpec now; GTimeSpec now;
timeout_source->interval = 1000*interval; timeout_source->interval = 1000 * interval;
timeout_source->granularity = 1000; timeout_source->seconds = TRUE;
g_get_monotonic_time (&now); g_get_monotonic_time (&now);
g_timeout_set_expiration (timeout_source, &now); g_timeout_set_expiration (timeout_source, &now);