luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

GPeriodic: remove repair functions

Browse Source 
Replace it with a single repair signal that either fires or does not.
This commit is contained in:
Ryan Lortie 2010-11-08 16:59:29 -05:00
parent 1a1fc130ec
commit 9fbfac6abb
4 changed files with 63 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gio/gio-sections.txt
View File

@ -2922,7 +2922,6 @@ g_periodic_remove
g_periodic_block
g_periodic_unblock
<SUBSECTION>
GPeriodicRepairFunc
g_periodic_damaged
<SUBSECTION Standard>
G_TYPE_PERIODIC

2
gio/gio-marshal.list
View File

@ -24,4 +24,4 @@ VOID:STRING,BOOLEAN
VOID:POINTER,INT,STRING
BOOLEAN:OBJECT
INT:OBJECT
VOID:UINT64
VOID:INT64

134
gio/gperiodic.c
View File

@ -95,7 +95,15 @@
* Since: 2.28
**/
typedef GObjectClass GPeriodicClass;
typedef struct _GPeriodicClass GPeriodicClass;
struct _GPeriodicClass
{
GObjectClass parent_class;
void (*tick) (GPeriodic *periodic,
gint64 timestamp);
void (*repair) (GPeriodic *periodic);
};
typedef struct
{
@ -105,13 +113,6 @@ typedef struct
guint id;
} GPeriodicTick;
typedef struct
{
GPeriodicRepairFunc callback;
gpointer user_data;
GDestroyNotify notify;
} GPeriodicRepair;
typedef struct
{
GSource source;
@ -130,7 +131,8 @@ struct _GPeriodic
gint low_priority;
GSList *ticks; /* List<GPeriodicTick> */
GSList *repairs; /* List<GPeriodicRepair> */
guint damaged : 1;
/* debug */
guint in_tick : 1;
@ -172,6 +174,26 @@ g_periodic_stop_skip (gpointer data)
return FALSE;
}
static void
g_periodic_real_tick (GPeriodic *periodic,
gint64 timestamp)
{
GSList *iter;
for (iter = periodic->ticks; iter; iter = iter->next)
{
GPeriodicTick *tick = iter->data;
tick->callback (periodic, timestamp, tick->user_data);
}
}
static void
g_periodic_real_repair (GPeriodic *periodic)
{
periodic->damaged = FALSE;
}
static void
g_periodic_run (GPeriodic *periodic)
{
@ -184,43 +206,24 @@ g_periodic_run (GPeriodic *periodic)
if (periodic->ticks)
{
guint64 microseconds;
GSList *iter;
microseconds = periodic->last_run / periodic->hz;
periodic->in_tick = TRUE;
for (iter = periodic->ticks; iter; iter = iter->next)
{
GPeriodicTick *tick = iter->data;
tick->callback (periodic, microseconds, tick->user_data);
}
microseconds = periodic->last_run / periodic->hz;
g_signal_emit (periodic, g_periodic_tick, 0, microseconds);
periodic->in_tick = FALSE;
}
g_assert (periodic->blocked == 0);
if (periodic->repairs)
if (periodic->damaged)
{
periodic->in_repair = TRUE;
while (periodic->repairs)
{
GPeriodicRepair *repair = periodic->repairs->data;
repair->callback (periodic, repair->user_data);
periodic->repairs = g_slist_remove (periodic->repairs, repair);
if (repair->notify)
repair->notify (repair->user_data);
g_slice_free (GPeriodicRepair, repair);
}
g_signal_emit (periodic, g_periodic_repair, 0);
periodic->in_repair = FALSE;
}
g_assert (!periodic->damaged);
usec = g_get_monotonic_time () - start;
g_assert (usec >= 0);
@ -265,7 +268,7 @@ g_periodic_prepare (GSource *source,
{
GPeriodic *periodic = PERIODIC_FROM_SOURCE (source);
if ((periodic->ticks || periodic->repairs) && !periodic->blocked)
if ((periodic->ticks || periodic->damaged) && !periodic->blocked)
/* We need to run. */
{
gint64 remaining;
@ -307,7 +310,7 @@ g_periodic_check (GSource *source)
{
GPeriodic *periodic = PERIODIC_FROM_SOURCE (source);
if ((periodic->ticks || periodic->repairs) && !periodic->blocked)
if ((periodic->ticks || periodic->damaged) && !periodic->blocked)
/* We need to run. */
{
guint64 now = g_periodic_get_microticks (periodic);
@ -435,34 +438,41 @@ g_periodic_init (GPeriodic *periodic)
}
static void
g_periodic_class_init (GObjectClass *class)
g_periodic_class_init (GPeriodicClass *class)
{
class->get_property = g_periodic_get_property;
class->set_property = g_periodic_set_property;
class->finalize = g_periodic_finalize;
GObjectClass *object_class = G_OBJECT_CLASS (class);
class->tick = g_periodic_real_tick;
class->repair = g_periodic_real_repair;
object_class->get_property = g_periodic_get_property;
object_class->set_property = g_periodic_set_property;
object_class->finalize = g_periodic_finalize;
g_periodic_tick = g_signal_new ("tick", G_TYPE_PERIODIC,
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
_gio_marshal_VOID__UINT64,
G_TYPE_NONE, 1, G_TYPE_UINT64);
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GPeriodicClass, tick),
NULL, NULL, _gio_marshal_VOID__INT64,
G_TYPE_NONE, 1, G_TYPE_INT64);
g_periodic_repair = g_signal_new ("repair", G_TYPE_PERIODIC,
G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GPeriodicClass, repair),
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
g_object_class_install_property (class, PROP_HZ,
g_object_class_install_property (object_class, PROP_HZ,
g_param_spec_uint ("hz", "ticks per second",
"rate (in Hz) at which the 'tick' signal is emitted",
1, 120, 1, G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (class, PROP_HIGH_PRIORITY,
g_object_class_install_property (object_class, PROP_HIGH_PRIORITY,
g_param_spec_int ("high-priority", "high priority level",
"the GSource priority level to run at",
G_MININT, G_MAXINT, 0, G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (class, PROP_LOW_PRIORITY,
g_object_class_install_property (object_class, PROP_LOW_PRIORITY,
g_param_spec_int ("low-priority", "low priority level",
"ignore tasks below this priority level",
G_MININT, G_MAXINT, 0, G_PARAM_READWRITE |
@ -635,45 +645,21 @@ g_periodic_remove (GPeriodic *periodic,
/**
* g_periodic_damaged:
* @periodic: a #GPeriodic clock
* @callback: a #GPeriodicRepairFunc
* @user_data: data for @callback
* @notify: for freeing @user_data when it is no longer needed
*
* Report damage and schedule @callback to be called during the next
* repair phase. Multiple registrations result in multiple invocations,
* so you should track for yourself if you are already registered.
* Report damage and schedule the "repair" signal to be emitted during
* the next repair phase.
*
* You may not call this function during the repair phase.
*
* Since: 2.28
**/
/**
* GPeriodicRepairFunc:
* @periodic: the #GPeriodic clock that the damage was reported to
* @user_data: the user data given to g_periodic_damaged()
*
* The signature of the callback function that is called during the
* repair phase when damaged was reported using g_periodic_damaged().
*
* Since: 2.28
**/
void
g_periodic_damaged (GPeriodic *periodic,
GPeriodicRepairFunc callback,
gpointer user_data,
GDestroyNotify notify)
g_periodic_damaged (GPeriodic *periodic)
{
GPeriodicRepair *repair;
g_return_if_fail (G_IS_PERIODIC (periodic));
g_return_if_fail (!periodic->in_repair);
repair = g_slice_new (GPeriodicRepair);
repair->callback = callback;
repair->user_data = user_data;
repair->notify = notify;
periodic->repairs = g_slist_prepend (periodic->repairs, repair);
periodic->damaged = TRUE;
}
/**

9
gio/gperiodic.h
View File

@ -38,9 +38,7 @@ G_BEGIN_DECLS
typedef struct _GPeriodic GPeriodic;
typedef void (* GPeriodicTickFunc) (GPeriodic *periodic,
guint64 timestamp,
gpointer user_data);
typedef void (* GPeriodicRepairFunc) (GPeriodic *periodic,
gint64 timestamp,
gpointer user_data);
GType g_periodic_get_type (void);
@ -62,10 +60,7 @@ void g_periodic_block (GPeriod
void g_periodic_unblock (GPeriodic *periodic,
gint64 unblock_time);
void g_periodic_damaged (GPeriodic *periodic,
GPeriodicRepairFunc callback,
gpointer user_data,
GDestroyNotify notify);
void g_periodic_damaged (GPeriodic *periodic);
G_END_DECLS