mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-27 23:20:31 +01:00
5022aff2c8
Since normalize already sorts the array, and verify needs to check
whether the array is sorted, we can implement verify() more efficiently.
In the usual case (where the property is normalized), we can just
iterate over the list and check that the ranges are increasing and
non-overlapping.
Only if that fails, do a shallow-copy of the array, sort it, and check
again. If it's still invalid after sorting, verification fails.
We don't need to create a GHashTable which adds all elements in between
the ranges. While the algorithm with hash table is O(n), the new version
with sorting is O(n*ln(n)). But of course, since the overall number of
range elements is limited to 4096, they are really both O(1). But more
importantly, it's just faster to iterate over the list and sort it, than
to fill a hash table.
---
Test with -O2, more-asserts=0:
diff --git c/src/libnm-core-impl/tests/test-setting.c w/src/libnm-core-impl/tests/test-setting.c
index 00fc838d1794..a0991b36d9d7 100644
--- c/src/libnm-core-impl/tests/test-setting.c
+++ w/src/libnm-core-impl/tests/test-setting.c
@@ -5266,5 +5266,5 @@ static void
test_ovs_port_trunks(void)
{
- const guint N_RUN = 10;
+ const guint N_RUN = 10000;
guint i_run;
gs_unref_object NMConnection *con = NULL;
$ make -j src/libnm-core-impl/tests/test-setting && \
libtool --mode=execute \
perf stat -r 5 -B \
src/libnm-core-impl/tests/test-setting -p /libnm/test_ovs_port_trunks
Before:
8,114.55 msec task-clock:u # 0.998 CPUs utilized ( +- 0.20% )
0 context-switches:u # 0.000 /sec
0 cpu-migrations:u # 0.000 /sec
341 page-faults:u # 41.980 /sec ( +- 0.16% )
25,172,559,932 cycles:u # 3.099 GHz ( +- 0.12% )
39,221,096,221 instructions:u # 1.56 insn per cycle ( +- 0.04% )
5,721,519,798 branches:u # 704.373 M/sec ( +- 0.07% )
230,728,395 branch-misses:u # 4.04% of all branches ( +- 0.28% )
8.1340 +- 0.0179 seconds time elapsed ( +- 0.22% )
After:
4,300.62 msec task-clock:u # 0.999 CPUs utilized ( +- 0.34% )
0 context-switches:u # 0.000 /sec
0 cpu-migrations:u # 0.000 /sec
342 page-faults:u # 79.435 /sec ( +- 0.20% )
13,231,554,996 cycles:u # 3.073 GHz ( +- 0.27% )
20,676,554,955 instructions:u # 1.55 insn per cycle ( +- 0.07% )
3,101,429,604 branches:u # 720.354 M/sec ( +- 0.11% )
118,808,950 branch-misses:u # 3.83% of all branches ( +- 0.34% )
4.3068 +- 0.0143 seconds time elapsed ( +- 0.33% )
|
||
|---|---|---|
| .. | ||
| 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-lldp | ||
| 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 |