luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-22 18:22:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio/gfilemonitor: Do not mark the filemonitor cancelled until vfunc is done

Browse Source 
As per previous commit we used atomic logic to handle the cancellation,
but that lead to a slightly different behavior because the file monitor
was then marked as cancelled before the vfunc implementation was called.

Use similar behavior now (by still relying on the atomic logic), by
marking the state as about-to-cancel as soon as we're starting the
cancellation (preventing other threads to cancel it), and eventually
fully marking it as cancelled.
This commit is contained in:
Marco Trevisan (Treviño) 2025-01-31 11:04:20 +01:00
parent 218b298a1b
commit 175e02f15c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gfilemonitor.c
View File

@ -51,6 +51,12 @@
#define DEFAULT_RATE_LIMIT_MSECS 800
typedef enum {
CANCEL_STATE_NONE,
CANCEL_STATE_CANCELLING,
CANCEL_STATE_CANCELLED,
} GFileMonitorCancelState;
struct _GFileMonitorPrivate
{
int cancelled; /* atomic */
@ -222,7 +228,7 @@ g_file_monitor_is_cancelled (GFileMonitor *monitor)
{
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
return g_atomic_int_get (&monitor->priv->cancelled);
return g_atomic_int_get (&monitor->priv->cancelled) == CANCEL_STATE_CANCELLED;
}
/**
@ -238,10 +244,13 @@ g_file_monitor_cancel (GFileMonitor *monitor)
{
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
if (!g_atomic_int_exchange (&monitor->priv->cancelled, TRUE))
if (g_atomic_int_compare_and_exchange (&monitor->priv->cancelled,
CANCEL_STATE_NONE,
CANCEL_STATE_CANCELLING))
{
G_FILE_MONITOR_GET_CLASS (monitor)->cancel (monitor);
g_atomic_int_set (&monitor->priv->cancelled, CANCEL_STATE_CANCELLED);
g_object_notify (G_OBJECT (monitor), "cancelled");
}
@ -289,7 +298,7 @@ g_file_monitor_emit_event (GFileMonitor *monitor,
g_return_if_fail (G_IS_FILE (child));
g_return_if_fail (!other_file || G_IS_FILE (other_file));
if (g_atomic_int_get (&monitor->priv->cancelled))
if (g_atomic_int_get (&monitor->priv->cancelled) != CANCEL_STATE_NONE)
return;
g_signal_emit (monitor, g_file_monitor_changed_signal, 0, child, other_file, event_type);