mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-05 12:40:16 +01:00
611f2c3a60
The file "nm-meta-setting-base-impl.c" is shared by "libnm-core-impl" and
"libnmc-setting". For "libnm-core-impl" it uses a efficient lookup from the
gtype. For "libnmc-setting", that class information is not available, so
it did a linear search. Instead, do a binary search.
Tested:
diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c
index 3434c858391f..62c366d2ca42 100644
--- a/src/libnm-core-impl/nm-meta-setting-base-impl.c
+++ b/src/libnm-core-impl/nm-meta-setting-base-impl.c
@@ -821,6 +821,11 @@ nm_meta_setting_infos_by_gtype(GType gtype)
{
const NMMetaSettingInfo *setting_info;
+#if _NM_META_SETTING_BASE_IMPL_LIBNM
+ return _infos_by_gtype_binary_search(gtype);
+#endif
+ nm_assert_not_reached();
+
#if _NM_META_SETTING_BASE_IMPL_LIBNM
setting_info = _infos_by_gtype_from_class(gtype);
#else
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index 85d549eb766c..65fcafd076c9 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -5134,6 +5134,29 @@ main(int argc, char **argv)
{
nmtst_init(&argc, &argv, TRUE);
+ {
+ gs_unref_object NMConnection *con = NULL;
+ guint8 ctr = 0;
+ guint i;
+
+ con = nmtst_create_minimal_connection("test", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+
+ nm_connection_add_setting(con, nm_setting_wired_new());
+
+ nmtst_connection_normalize(con);
+ nmtst_assert_connection_verifies_without_normalization(con);
+
+ for (i = 0; i < 10000000; i++) {
+ ctr += GPOINTER_TO_UINT(nm_connection_get_setting(con, NM_TYPE_SETTING_WIRED));
+ ctr += GPOINTER_TO_UINT(nm_connection_get_setting(con, NM_TYPE_SETTING_CONNECTION));
+ ctr += GPOINTER_TO_UINT(nm_connection_get_setting(con, NM_TYPE_SETTING_PROXY));
+ ctr += GPOINTER_TO_UINT(nm_connection_get_setting(con, NM_TYPE_SETTING_WIREGUARD));
+ ctr += GPOINTER_TO_UINT(nm_connection_get_setting(con, NM_TYPE_SETTING_IP4_CONFIG));
+ }
+
+ return !!ctr;
+ }
+
g_test_add_func("/libnm/test_connection_uuid", test_connection_uuid);
g_test_add_func("/libnm/settings/test_nm_meta_setting_types_by_priority",
Results of `make src/libnm-core-impl/tests/test-setting && libtool --mode=execute perf stat -r 5 -B src/libnm-core-impl/tests/test-setting`:
1) previous linear search: 3,182.81 msec
2) bsearch not inlined: 1,611.19 msec
3) bsearch open-coded: 1,214.45 msec
4) bsearch inlined: 1,167.70 msec
5) lookup from class: 1,147.64 msec
1) previous implementation
2) using nm_array_find_bsearch()
3) manually implementing binary search
4) using nm_array_find_bsearch_inline()
5) only available to libnm-core as it uses internal meta data
Note that for "libnm-core-impl" the implementation was already fast (5), and
it didn't change. It only changed to binary search for "libnmc-setting",
which arguably is a less strong use-case.
|
||
|---|---|---|
| .. | ||
| c-list | ||
| c-rbtree | ||
| c-siphash | ||
| c-stdaux | ||
| contrib | ||
| core | ||
| libnm-base | ||
| libnm-client-aux-extern | ||
| libnm-client-impl | ||
| libnm-client-public | ||
| libnm-client-test | ||
| libnm-core-aux-extern | ||
| libnm-core-aux-intern | ||
| libnm-core-impl | ||
| libnm-core-intern | ||
| libnm-core-public | ||
| libnm-crypto | ||
| libnm-glib-aux | ||
| libnm-log-core | ||
| libnm-log-null | ||
| libnm-platform | ||
| libnm-std-aux | ||
| libnm-systemd-core | ||
| libnm-systemd-shared | ||
| libnm-udev-aux | ||
| libnmc-base | ||
| libnmc-setting | ||
| libnmt-newt | ||
| linux-headers | ||
| n-acd | ||
| n-dhcp4 | ||
| nm-cloud-setup | ||
| nm-compat-headers | ||
| nm-daemon-helper | ||
| nm-dispatcher | ||
| nm-initrd-generator | ||
| nm-online | ||
| nm-priv-helper | ||
| nmcli | ||
| nmtui | ||
| tests | ||
| meson.build | ||
| README.md | ||
src/
Most of the subdirectories are static helper libraries, which get linked into one of the final build artifacts (like libnm, nmcli or NetworkManager). Static libraries are internal API.
The only public API is libnm, which is a shared library provided client implementations.
Our own clients (like nmcli and nmtui) also use libnm, the shared library. But they also use additional static helper libraries.
The daemon statically links against a part of libnm, the part that provides connection profiles. That is libnm-core. libnm-core is thus statically linked with libnm and the daemon. It does not get linked by clients that already link with libnm (like nmtui).
Read the individual README.md files in the subdirectories for details:
| Directory | Description |
|---|---|
| core/ | the NetworkManager daemon |
| nmcli/ | nmcli application, a command line client for NetworkManager |
| nmtui/ | nmtui application, a text UI client for NetworkManager |
| nm-cloud-setup/ | service to automatically configure NetworkManager in cloud environment |
| nm-initrd-generator/ | generates NetworkManager configuration by parsing kernel command line options for dracut/initrd |
| nm-dispatcher/ | NetworkManager-dispatcher service to run user scripts |
| nm-online/ | application which checks whether NetworkManager is done, for implementing NetworkManager-wait-online.service |
| nm-priv-helper/ | internal service for privileged operations |
| nm-daemon-helper/ | internal helper binary spawned by NetworkManager |
| libnm-std-aux/ | internal helper library for standard C |
| libnm-glib-aux/ | internal helper library for glib |
| libnm-log-null/ | internal helper library with dummy (null) logging backend |
| libnm-log-core/ | internal helper library with logging backend (syslog) used by daemon |
| libnm-base/ | internal helper library with base definitions |
| libnm-platform/ | internal helper library for netlink and other platform/kernel API |
| libnm-udev-aux/ | internal helper library for libudev |
| libnm-core-public/ | public API of libnm (libnm-core part) |
| libnm-core-intern/ | internal API of libnm-core, used by libnm and daemon |
| libnm-core-impl/ | implementation of libnm-core |
| libnm-core-aux-intern/ | internal helper library on top of libnm-core (used by libnm-core itself) |
| libnm-core-aux-extern/ | internal helper library on top of libnm-core (not used by libnm-core) |
| libnm-client-public/ | public API of libnm (NMClient part) |
| libnm-client-impl/ | implementation of libnm (NMClient) |
| libnm-client-aux-extern/ | internal helper library on top of libnm (not used by libnm itself) |
| libnmc-base/ | internal helper library for libnm clients |
| libnmc-setting/ | internal helper library for setting connection profiles (used by nmcli) |
| libnmt-newt/ | internal helper library for libnewt for nmtui |
| linux-headers/ | extra Linux kernel UAPI headers |
| contrib/ | sources that are not used by NetworkManager itself |
| tests/ | unit tests that are not specific to one of the other directories |
| libnm-client-test/ | internal helper library with test utils for libnm |
| c-list/ | fork of c-util helper library for intrusive, doubly linked list |
| c-rbtree/ | fork of c-util helper library for intrusive Red-Black Tree |
| c-siphash/ | fork of c-util helper library for SIPHash24 |
| c-stdaux/ | fork of c-util general purpose helpers for standard C |
| n-acd/ | fork of nettools IPv4 ACD library |
| n-dhcp4/ | fork of nettools DHCPv4 library |
| libnm-systemd-core/ | fork of systemd code as network library |
| libnm-systemd-shared/ | fork of systemd code as general purpose library |