fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 13:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: rework caching singleton value in _nm_dbus_bus_type()

Browse source 
No need for g_once_init_enter(). In case of a race, we can just
twice determine the value. As long as only one thread wins the race,
this is totally fine (also, both threads probably would give the same
result anyway).
This commit is contained in:
Thomas Haller 2019-10-12 14:03:36 +02:00
parent a57a1ba2fc
commit 58a48acfd9
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libnm/nm-dbus-helpers.c
View file

@ -9,21 +9,22 @@
#include "nm-dbus-interface.h"
static GBusType nm_bus = G_BUS_TYPE_SYSTEM;
GBusType
_nm_dbus_bus_type (void)
{
static gsize init_value = 0;
static volatile int bus_type = G_BUS_TYPE_NONE;
int v;
if (g_once_init_enter (&init_value)) {
v = g_atomic_int_get (&bus_type);
if (G_UNLIKELY (v == G_BUS_TYPE_NONE)) {
v = G_BUS_TYPE_SYSTEM;
if (g_getenv ("LIBNM_USE_SESSION_BUS"))
nm_bus = G_BUS_TYPE_SESSION;
g_once_init_leave (&init_value, 1);
v = G_BUS_TYPE_SESSION;
if (!g_atomic_int_compare_and_exchange (&bus_type, G_BUS_TYPE_NONE, v))
v = g_atomic_int_get (&bus_type);
nm_assert (v != G_BUS_TYPE_NONE);
}
return nm_bus;
return v;
}
/* D-Bus has an upper limit on number of Match rules and it's rather easy