[glib/mcatanzaro/gresolver-reload: 12/12] gresolver: add missing locking
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/mcatanzaro/gresolver-reload: 12/12] gresolver: add missing locking
- Date: Tue, 23 Nov 2021 16:41:52 +0000 (UTC)
commit 4a37a69be4ea25f90bf8da8a2040deb4d502b003
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Mon Nov 22 15:20:18 2021 -0600
gresolver: add missing locking
This is sad, but GResolver has one member variable for historical
reasons, to implement the reload signal. Since it offers a global
singleton, we should make sure it's really safe to use from multiple
threads at once.
gio/gresolver.c | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 0a184f35d..83c7510b8 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -64,10 +64,9 @@ static guint signals[LAST_SIGNAL] = { 0 };
struct _GResolverPrivate {
#ifdef G_OS_UNIX
- time_t resolv_conf_timestamp;
-#else
- int dummy;
+ GMutex mutex;
#endif
+ time_t resolv_conf_timestamp; /* protected by @mutex */
};
/**
@@ -148,9 +147,25 @@ g_resolver_real_lookup_service_finish (GResolver *resolver,
return srv_records_to_targets (records);
}
+static void
+g_resolver_finalize (GObject *object)
+{
+#ifdef G_OS_UNIX
+ GResolver *resolver = G_RESOLVER (object);
+
+ g_mutex_clear (&resolver->priv->mutex);
+#endif
+
+ G_OBJECT_CLASS (g_resolver_parent_class)->finalize (object);
+}
+
static void
g_resolver_class_init (GResolverClass *resolver_class)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (resolver_class);
+
+ object_class->finalize = g_resolver_finalize;
+
/* Automatically pass these over to the lookup_records methods */
resolver_class->lookup_service = g_resolver_real_lookup_service;
resolver_class->lookup_service_async = g_resolver_real_lookup_service_async;
@@ -193,6 +208,8 @@ g_resolver_init (GResolver *resolver)
#ifdef G_OS_UNIX
if (stat (_PATH_RESCONF, &st) == 0)
resolver->priv->resolv_conf_timestamp = st.st_mtime;
+
+ g_mutex_init (&resolver->priv->mutex);
#endif
}
@@ -258,11 +275,15 @@ maybe_emit_reload (GResolver *resolver)
if (stat (_PATH_RESCONF, &st) == 0)
{
+ g_mutex_lock (&resolver->priv->mutex);
if (st.st_mtime != resolver->priv->resolv_conf_timestamp)
{
resolver->priv->resolv_conf_timestamp = st.st_mtime;
+ g_mutex_unlock (&resolver->priv->mutex);
g_signal_emit (resolver, signals[RELOAD], 0);
}
+ else
+ g_mutex_unlock (&resolver->priv->mutex);
}
#endif
}
@@ -1210,15 +1231,21 @@ g_resolver_lookup_records_finish (GResolver *resolver,
guint64
g_resolver_get_serial (GResolver *resolver)
{
+ guint64 result;
+
g_return_val_if_fail (G_IS_RESOLVER (resolver), 0);
maybe_emit_reload (resolver);
#ifdef G_OS_UNIX
- return (guint64) resolver->priv->resolv_conf_timestamp;
+ g_mutex_lock (&resolver->priv->mutex);
+ result = resolver->priv->resolv_conf_timestamp;
+ g_mutex_unlock (&resolver->priv->mutex);
#else
- return 1;
+ result = 1;
#endif
+
+ return result;
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]