diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-25 12:06:05 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-09-25 12:17:22 +0200 |
commit | 7e833f301eeca5114be3315ec4f4385cf34977af (patch) | |
tree | 198405e6b83dd3f13acf997e73b565da3d4fa8ee /src/test/test-arphrd-list.c | |
parent | 5a2904a2f7661526cfbdb19d8d425dad11afc03c (diff) | |
download | systemd-7e833f301eeca5114be3315ec4f4385cf34977af.tar.gz |
basic: massively reduce the size of arphdr lookup functions
Our biggest object in libsystemd was a table full of zeros, for the arphdr
names. Let's use a switch (which gcc nicely optimizes for us), instead a
table with a gap between 826 and 65534:
$ ls -l build{,2}/src/basic/a6ba3eb@@basic@sta/arphrd-list.c.o
-rw-rw-r--. 1 zbyszek zbyszek 540232 Sep 22 00:29 build/src/basic/a6ba3eb\@\@basic\@sta/arphrd-list.c.o
-rw-rw-r--. 1 zbyszek zbyszek 20512 Sep 25 11:56 build2/src/basic/a6ba3eb\@\@basic\@sta/arphrd-list.c.o
$ ls -l build{,2}/src/shared/libsystemd-shared-243.so
-rwxrwxr-x. 1 zbyszek zbyszek 6774368 Sep 22 00:29 build/src/shared/libsystemd-shared-243.so
-rwxrwxr-x. 1 zbyszek zbyszek 6254808 Sep 25 12:16 build2/src/shared/libsystemd-shared-243.so
No functional change.
Diffstat (limited to 'src/test/test-arphrd-list.c')
-rw-r--r-- | src/test/test-arphrd-list.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c index e5c50f37dc..3010ca6b45 100644 --- a/src/test/test-arphrd-list.c +++ b/src/test/test-arphrd-list.c @@ -1,31 +1,27 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #include <linux/if_arp.h> -#include <string.h> -#include "macro.h" #include "string-util.h" #include "tests.h" -_unused_ \ -static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); - -#include "arphrd-from-name.h" #include "arphrd-list.h" -#include "arphrd-to-name.h" int main(int argc, const char *argv[]) { test_setup_logging(LOG_INFO); - for (unsigned i = 1; i < ELEMENTSOF(arphrd_names); i++) - if (arphrd_names[i]) { - log_info("%i: %s", i, arphrd_to_name(i)); + for (int i = 0; i <= ARPHRD_VOID + 1; i++) { + const char *name; + + name = arphrd_to_name(i); + if (name) { + log_info("%i: %s", i, name); - assert_se(streq(arphrd_to_name(i), arphrd_names[i])); - assert_se(arphrd_from_name(arphrd_names[i]) == (int) i); + assert_se(arphrd_from_name(name) == i); } + } - assert_se(arphrd_to_name(arphrd_max()) == NULL); + assert_se(arphrd_to_name(ARPHRD_VOID + 1) == NULL); assert_se(arphrd_to_name(0) == NULL); assert_se(arphrd_from_name("huddlduddl") == -EINVAL); assert_se(arphrd_from_name("") == -EINVAL); |