summaryrefslogtreecommitdiff
path: root/libnm-core/nm-setting-adsl.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-07-28 15:26:03 +0200
committerThomas Haller <thaller@redhat.com>2018-08-10 10:38:19 +0200
commit3793804314c32b7199311736a8b1638c8f28d9fc (patch)
tree9b7261dd787b611f3c181831eb106d287aafdd19 /libnm-core/nm-setting-adsl.c
parent2b43ce3a940664a063f49c167abb614c241940cf (diff)
downloadNetworkManager-3793804314c32b7199311736a8b1638c8f28d9fc.tar.gz
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties and D-Bus-only properties. Rework the tracking of the list, so that: - instead of attaching the data to the GType of the setting via g_type_set_qdata(), it is tracked in a static array indexed by NMMetaSettingType. This allows to find the setting-data by simple pointer arithmetic, instead of taking a look and iterating (like g_type_set_qdata() does). Note, that this is still thread safe, because the static table entry is initialized in the class-init function with _nm_setting_class_commit(). And it only accessed by following a NMSettingClass instance, thus the class constructor already ran (maybe not for all setting classes, but for the particular one that we look up). I think this makes initialization of the metadata simpler to understand. Previously, in a first phase each class would attach the metadata to the GType as setting_property_overrides_quark(). Then during nm_setting_class_ensure_properties() it would merge them and set as setting_properties_quark(). Now, during the first phase, we only incrementally build a properties_override GArray, which we finally hand over during nm_setting_class_commit(). - sort the property infos by name and do binary search. Also expose this meta data types as internal API in nm-setting-private.h. While not accessed yet, it can prove beneficial, to have direct (internal) access to these structures. Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct naming scheme. We already have 40+ subclasses of NMSetting that are called NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a new, distinct name.
Diffstat (limited to 'libnm-core/nm-setting-adsl.c')
-rw-r--r--libnm-core/nm-setting-adsl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index eb9aad41ab..9ffff92783 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -355,7 +355,6 @@ nm_setting_adsl_class_init (NMSettingAdslClass *klass)
object_class->get_property = get_property;
object_class->finalize = finalize;
- setting_class->setting_info = &nm_meta_setting_infos[NM_META_SETTING_TYPE_ADSL];
setting_class->verify = verify;
setting_class->verify_secrets = verify_secrets;
setting_class->need_secrets = need_secrets;
@@ -445,4 +444,6 @@ nm_setting_adsl_class_init (NMSettingAdslClass *klass)
0, 65536, 0,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS));
+
+ _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_ADSL);
}