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

gfilemonitor: Use atomic API to get / store cancelled state

Browse Source
This commit is contained in:
Marco Trevisan (Treviño) 2025-01-30 19:10:40 +01:00
parent 589c8295ea
commit d1a72efeb3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gfilemonitor.c
View File

@ -25,6 +25,7 @@
#include "gfilemonitor.h" #include "gfilemonitor.h"
#include "gioenumtypes.h" #include "gioenumtypes.h"
#include "glib.h"
#include "gmarshal-internal.h" #include "gmarshal-internal.h"
#include "gfile.h" #include "gfile.h"
#include "gvfs.h" #include "gvfs.h"
@ -52,7 +53,7 @@
struct _GFileMonitorPrivate struct _GFileMonitorPrivate
{ {
gboolean cancelled; int cancelled; /* atomic */
}; };
G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GFileMonitor, g_file_monitor, G_TYPE_OBJECT) G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GFileMonitor, g_file_monitor, G_TYPE_OBJECT)
@ -219,13 +220,9 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
gboolean gboolean
g_file_monitor_is_cancelled (GFileMonitor *monitor) g_file_monitor_is_cancelled (GFileMonitor *monitor)
{ {
gboolean res;
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE); g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
res = monitor->priv->cancelled; return g_atomic_int_get (&monitor->priv->cancelled);
return res;
} }
/** /**
@ -241,11 +238,10 @@ g_file_monitor_cancel (GFileMonitor *monitor)
{ {
g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE); g_return_val_if_fail (G_IS_FILE_MONITOR (monitor), FALSE);
if (!monitor->priv->cancelled) if (!g_atomic_int_exchange (&monitor->priv->cancelled, TRUE))
{ {
G_FILE_MONITOR_GET_CLASS (monitor)->cancel (monitor); G_FILE_MONITOR_GET_CLASS (monitor)->cancel (monitor);
monitor->priv->cancelled = TRUE;
g_object_notify (G_OBJECT (monitor), "cancelled"); g_object_notify (G_OBJECT (monitor), "cancelled");
} }
@ -293,7 +289,7 @@ g_file_monitor_emit_event (GFileMonitor *monitor,
g_return_if_fail (G_IS_FILE (child)); g_return_if_fail (G_IS_FILE (child));
g_return_if_fail (!other_file || G_IS_FILE (other_file)); g_return_if_fail (!other_file || G_IS_FILE (other_file));
if (monitor->priv->cancelled) if (g_atomic_int_get (&monitor->priv->cancelled))
return; return;
g_signal_emit (monitor, g_file_monitor_changed_signal, 0, child, other_file, event_type); g_signal_emit (monitor, g_file_monitor_changed_signal, 0, child, other_file, event_type);

6
gio/tests/meson.build
View File

@ -134,7 +134,11 @@ gio_tests = {
'vfs' : {}, 'vfs' : {},
'volumemonitor' : {}, 'volumemonitor' : {},
'glistmodel' : {}, 'glistmodel' : {},
'testfilemonitor' : {'suite' : ['slow', 'flaky']}, 'testfilemonitor' : {
'suite' : ['slow'],
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
'can_fail' : host_system in ['darwin'],
},
'thumbnail-verification' : {}, 'thumbnail-verification' : {},
'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']}, 'tls-certificate' : {'extra_sources' : ['gtesttlsbackend.c']},
'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},