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

gmain: Factor out common GTimeoutSource code

Browse Source 
This allows it to be reused and extended (internally) a little more.
This commit introduces no functional changes, but allows for more easy
additions in a following commit.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall
2022-05-27 13:19:54 +01:00
parent 93bf87528d
commit af02a614a2
1 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
glib/gmain.c
View File

@@ -4980,6 +4980,21 @@ g_timeout_dispatch (GSource *source,
return again; return again;
} }
static GSource *
timeout_source_new (guint interval,
gboolean seconds)
{
GSource *source = g_source_new (&g_timeout_funcs, sizeof (GTimeoutSource));
GTimeoutSource *timeout_source = (GTimeoutSource *)source;
timeout_source->interval = interval;
timeout_source->seconds = seconds;
g_timeout_set_expiration (timeout_source, g_get_monotonic_time ());
return source;
}
/** /**
* g_timeout_source_new: * g_timeout_source_new:
* @interval: the timeout interval in milliseconds. * @interval: the timeout interval in milliseconds.
@@ -4998,13 +5013,7 @@ g_timeout_dispatch (GSource *source,
GSource * GSource *
g_timeout_source_new (guint interval) g_timeout_source_new (guint interval)
{ {
GSource *source = g_source_new (&g_timeout_funcs, sizeof (GTimeoutSource)); return timeout_source_new (interval, FALSE);
GTimeoutSource *timeout_source = (GTimeoutSource *)source;
timeout_source->interval = interval;
g_timeout_set_expiration (timeout_source, g_get_monotonic_time ());
return source;
} }
/** /**
@@ -5030,17 +5039,36 @@ g_timeout_source_new (guint interval)
GSource * GSource *
g_timeout_source_new_seconds (guint interval) g_timeout_source_new_seconds (guint interval)
{ {
GSource *source = g_source_new (&g_timeout_funcs, sizeof (GTimeoutSource)); return timeout_source_new (interval, TRUE);
GTimeoutSource *timeout_source = (GTimeoutSource *)source;
timeout_source->interval = interval;
timeout_source->seconds = TRUE;
g_timeout_set_expiration (timeout_source, g_get_monotonic_time ());
return source;
} }
static guint
timeout_add_full (gint priority,
guint interval,
gboolean seconds,
GSourceFunc function,
gpointer data,
GDestroyNotify notify)
{
GSource *source;
guint id;
g_return_val_if_fail (function != NULL, 0);
source = timeout_source_new (interval, seconds);
if (priority != G_PRIORITY_DEFAULT)
g_source_set_priority (source, priority);
g_source_set_callback (source, function, data, notify);
id = g_source_attach (source, NULL);
TRACE (GLIB_TIMEOUT_ADD (source, g_main_context_default (), id, priority, interval, function, data));
g_source_unref (source);
return id;
}
/** /**
* g_timeout_add_full: (rename-to g_timeout_add) * g_timeout_add_full: (rename-to g_timeout_add)
@@ -5086,24 +5114,7 @@ g_timeout_add_full (gint priority,
gpointer data, gpointer data,
GDestroyNotify notify) GDestroyNotify notify)
{ {
GSource *source; return timeout_add_full (priority, interval, FALSE, function, data, notify);
guint id;
g_return_val_if_fail (function != NULL, 0);
source = g_timeout_source_new (interval);
if (priority != G_PRIORITY_DEFAULT)
g_source_set_priority (source, priority);
g_source_set_callback (source, function, data, notify);
id = g_source_attach (source, NULL);
TRACE (GLIB_TIMEOUT_ADD (source, g_main_context_default (), id, priority, interval, function, data));
g_source_unref (source);
return id;
} }
/** /**