depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

device: Attach sources to correct main context

Browse source 
We were attaching the sources to the default main context. Instead, we
should be attaching them to the current tasks main context (or, failing
that, the current thread local main context).
This commit is contained in:
Benjamin Berg 2021-04-23 09:56:49 +02:00
parent 1ca56adff5
commit b9df7a4e70
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libfprint/fp-device.c
View file

@ -113,7 +113,8 @@ fp_device_cancelled_cb (GCancellable *cancellable, FpDevice *self)
fp_device_cancel_in_idle_cb, fp_device_cancel_in_idle_cb,
self, self,
NULL); NULL);
g_source_attach (priv->current_idle_cancel_source, NULL); g_source_attach (priv->current_idle_cancel_source,
g_task_get_context (priv->current_task));
g_source_unref (priv->current_idle_cancel_source); g_source_unref (priv->current_idle_cancel_source);
} }

11
libfprint/fpi-device.c
View file

@ -334,12 +334,18 @@ fpi_device_add_timeout (FpDevice *device,
{ {
FpDevicePrivate *priv = fp_device_get_instance_private (device); FpDevicePrivate *priv = fp_device_get_instance_private (device);
FpDeviceTimeoutSource *source; FpDeviceTimeoutSource *source;
GMainContext *context;
source = (FpDeviceTimeoutSource *) g_source_new (&timeout_funcs, source = (FpDeviceTimeoutSource *) g_source_new (&timeout_funcs,
sizeof (FpDeviceTimeoutSource)); sizeof (FpDeviceTimeoutSource));
source->device = device; source->device = device;
g_source_attach (&source->source, NULL); if (priv->current_task)
context = g_task_get_context (priv->current_task);
else
context = g_main_context_get_thread_default ();
g_source_attach (&source->source, context);
g_source_set_callback (&source->source, (GSourceFunc) func, user_data, destroy_notify); g_source_set_callback (&source->source, (GSourceFunc) func, user_data, destroy_notify);
g_source_set_ready_time (&source->source, g_source_set_ready_time (&source->source,
g_source_get_time (&source->source) + interval * (guint64) 1000); g_source_get_time (&source->source) + interval * (guint64) 1000);
@ -930,7 +936,8 @@ fpi_device_return_task_in_idle (FpDevice *device,
data, data,
(GDestroyNotify) fpi_device_task_return_data_free); (GDestroyNotify) fpi_device_task_return_data_free);
g_source_attach (priv->current_task_idle_return_source, NULL); g_source_attach (priv->current_task_idle_return_source,
g_task_get_context (priv->current_task));
g_source_unref (priv->current_task_idle_return_source); g_source_unref (priv->current_task_idle_return_source);
} }