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

libnm: avoid constructor function to initialize setting registration for NMSetting

Browse source 
For NMSetting subtypes, we need the static dictionaries "registered_settings" and
"registered_settings_by_type" to keep track of existing NMSetting types.

Initialize these dictionaries inside NMSetting's type initialization code.
This is guaranteed to run before any use of NMSetting type, and is also
guarded by a mutex.

Also, drop the __attribute__((constructor)) function to initialize the
hash tables. They are not needed, and it's ugly to run code before
main().
This commit is contained in:
Thomas Haller 2018-06-24 17:06:28 +02:00
parent b26efa5b68
commit 8093c9d329
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libnm-core/nm-setting.c
View file

@ -53,9 +53,7 @@
* of properties and allowed values.
*/
G_DEFINE_ABSTRACT_TYPE (NMSetting, nm_setting, G_TYPE_OBJECT)
#define NM_SETTING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING, NMSettingPrivate))
/*****************************************************************************/
typedef struct {
const char *name;
@ -63,10 +61,6 @@ typedef struct {
NMSettingPriority priority;
} SettingInfo;
typedef struct {
const SettingInfo *info;
} NMSettingPrivate;
enum {
PROP_0,
PROP_NAME,
@ -74,6 +68,16 @@ enum {
PROP_LAST
};
typedef struct {
const SettingInfo *info;
} NMSettingPrivate;
static void _register_settings_init (void);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (NMSetting, nm_setting, G_TYPE_OBJECT, _register_settings_init () )
#define NM_SETTING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING, NMSettingPrivate))
/*****************************************************************************/
static GHashTable *registered_settings = NULL;
@ -91,19 +95,15 @@ _nm_gtype_hash (gconstpointer v)
}
static void
_ensure_registered (void)
_register_settings_init (void)
{
if (G_UNLIKELY (registered_settings == NULL)) {
registered_settings = g_hash_table_new (nm_str_hash, g_str_equal);
registered_settings_by_type = g_hash_table_new (_nm_gtype_hash, _nm_gtype_equal);
}
registered_settings = g_hash_table_new (nm_str_hash, g_str_equal);
registered_settings_by_type = g_hash_table_new (_nm_gtype_hash, _nm_gtype_equal);
}
static void __attribute__((constructor))
_ensure_registered_constructor (void)
{
_ensure_registered ();
}
#define _register_settings_ensure_inited() (nm_setting_get_type ())
/*****************************************************************************/
#define _ensure_setting_info(self, priv) \
G_STMT_START { \
@ -135,7 +135,7 @@ _nm_register_setting_impl (const char *name,
nm_assert (!NM_IN_SET (type, G_TYPE_INVALID, G_TYPE_NONE));
nm_assert (priority != NM_SETTING_PRIORITY_INVALID);
_ensure_registered ();
_register_settings_ensure_inited ();
nm_assert (!g_hash_table_lookup (registered_settings, name));
nm_assert (!g_hash_table_lookup (registered_settings_by_type, &type));
@ -154,7 +154,7 @@ _nm_register_setting_impl (const char *name,
static const SettingInfo *
_nm_setting_lookup_setting_by_type (GType type)
{
_ensure_registered ();
_register_settings_ensure_inited ();
return g_hash_table_lookup (registered_settings_by_type, &type);
}
@ -222,7 +222,7 @@ nm_setting_lookup_type (const char *name)
g_return_val_if_fail (name, G_TYPE_INVALID);
_ensure_registered ();
_register_settings_ensure_inited ();
info = g_hash_table_lookup (registered_settings, name);
return info ? info->type : G_TYPE_INVALID;