Attachment 79966 Details for Bug 65130 – [PATCH] Use GOnce for interface type registration

[PATCH] Use GOnce for interface type registration

0001-Use-GOnce-for-interface-type-registration.patch (text/plain), 3.77 KB, created by Tomas Bzatek on 2013-05-29 13:58:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Bzatek

Created: 2013-05-29 13:58:38 UTC

Size: 3.77 KB

patch

obsolete

>From adf15a5f1723ac35f808ab541fc51334c53a2d24 Mon Sep 17 00:00:00 2001
>From: Tomas Bzatek <tbzatek@redhat.com>
>Date: Wed, 29 May 2013 15:45:31 +0200
>Subject: [PATCH] Use GOnce for interface type registration
>
>Static local variable may not be enough since it doesn't provide locking.
>
>Related to these udisksd warnings:
>  GLib-GObject-WARNING **: cannot register existing type `PolkitSubject'
>
>Thanks to Hans de Goede for spotting this!
>---
> src/polkit/polkitidentity.c                   | 10 ++++++----
> src/polkit/polkitsubject.c                    | 10 ++++++----
> src/polkitbackend/polkitbackendactionlookup.c | 10 ++++++----
> 3 files changed, 18 insertions(+), 12 deletions(-)
>
>diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c
>index dd15b2f..7813c2c 100644
>--- a/src/polkit/polkitidentity.c
>+++ b/src/polkit/polkitidentity.c
>@@ -49,9 +49,9 @@ base_init (gpointer g_iface)
> GType
> polkit_identity_get_type (void)
> {
>-  static GType iface_type = 0;
>+  static volatile gsize g_define_type_id__volatile = 0;
> 
>-  if (iface_type == 0)
>+  if (g_once_init_enter (&g_define_type_id__volatile))
>     {
>       static const GTypeInfo info =
>       {
>@@ -67,12 +67,14 @@ polkit_identity_get_type (void)
>         NULL                    /* value_table    */
>       };
> 
>-      iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0);
>+      GType iface_type =
>+        g_type_register_static (G_TYPE_INTERFACE, "PolkitIdentity", &info, 0);
> 
>       g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
>+      g_once_init_leave (&g_define_type_id__volatile, iface_type);
>     }
> 
>-  return iface_type;
>+  return g_define_type_id__volatile;
> }
> 
> /**
>diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
>index d2c4c20..aed5795 100644
>--- a/src/polkit/polkitsubject.c
>+++ b/src/polkit/polkitsubject.c
>@@ -50,9 +50,9 @@ base_init (gpointer g_iface)
> GType
> polkit_subject_get_type (void)
> {
>-  static GType iface_type = 0;
>+  static volatile gsize g_define_type_id__volatile = 0;
> 
>-  if (iface_type == 0)
>+  if (g_once_init_enter (&g_define_type_id__volatile))
>     {
>       static const GTypeInfo info =
>       {
>@@ -68,12 +68,14 @@ polkit_subject_get_type (void)
>         NULL                    /* value_table    */
>       };
> 
>-      iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0);
>+      GType iface_type =
>+        g_type_register_static (G_TYPE_INTERFACE, "PolkitSubject", &info, 0);
> 
>       g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
>+      g_once_init_leave (&g_define_type_id__volatile, iface_type);
>     }
> 
>-  return iface_type;
>+  return g_define_type_id__volatile;
> }
> 
> /**
>diff --git a/src/polkitbackend/polkitbackendactionlookup.c b/src/polkitbackend/polkitbackendactionlookup.c
>index 5a1a228..20747e7 100644
>--- a/src/polkitbackend/polkitbackendactionlookup.c
>+++ b/src/polkitbackend/polkitbackendactionlookup.c
>@@ -74,9 +74,9 @@ base_init (gpointer g_iface)
> GType
> polkit_backend_action_lookup_get_type (void)
> {
>-  static GType iface_type = 0;
>+  static volatile gsize g_define_type_id__volatile = 0;
> 
>-  if (iface_type == 0)
>+  if (g_once_init_enter (&g_define_type_id__volatile))
>     {
>       static const GTypeInfo info =
>       {
>@@ -92,12 +92,14 @@ polkit_backend_action_lookup_get_type (void)
>         NULL                    /* value_table    */
>       };
> 
>-      iface_type = g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0);
>+      GType iface_type =
>+        g_type_register_static (G_TYPE_INTERFACE, "PolkitBackendActionLookup", &info, 0);
> 
>       g_type_interface_add_prerequisite (iface_type, G_TYPE_OBJECT);
>+      g_once_init_leave (&g_define_type_id__volatile, iface_type);
>     }
> 
>-  return iface_type;
>+  return g_define_type_id__volatile;
> }
> 
> /**
>-- 
>1.8.1.5
>

Actions: View

Attachments on bug 65130: 79966

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.