From 6937487be73cd4563b876413277a295a5fe2f32c Mon Sep 17 00:00:00 2001 From: James Byrne Date: Tue, 2 Jul 2019 11:35:03 +0200 Subject: libbb: reduce the overhead of single parameter bb_error_msg() calls Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower overhead call to bb_perror_msg() when only a string was being printed with no parameters. This saves space for some CPU architectures because it avoids the overhead of a call to a variadic function. However there has never been a simple version of bb_error_msg(), and since 2007 many new calls to bb_perror_msg() have been added that only take a single parameter and so could have been using bb_simple_perror_message(). This changeset introduces 'simple' versions of bb_info_msg(), bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and bb_herror_msg_and_die(), and replaces all calls that only take a single parameter, or use something like ("%s", arg), with calls to the corresponding 'simple' version. Since it is likely that single parameter calls to the variadic functions may be accidentally reintroduced in the future a new debugging config option WARN_SIMPLE_MSG has been introduced. This uses some macro magic which will cause any such calls to generate a warning, but this is turned off by default to avoid use of the unpleasant macros in normal circumstances. This is a large changeset due to the number of calls that have been replaced. The only files that contain changes other than simple substitution of function calls are libbb.h, libbb/herror_msg.c, libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c, networking/udhcp/common.h and util-linux/mdev.c additonal macros have been added for logging so that single parameter and multiple parameter logging variants exist. The amount of space saved varies considerably by architecture, and was found to be as follows (for 'defconfig' using GCC 7.4): Arm: -92 bytes MIPS: -52 bytes PPC: -1836 bytes x86_64: -938 bytes Note that for the MIPS architecture only an exception had to be made disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h) because it made these files larger on MIPS. Signed-off-by: James Byrne Signed-off-by: Denys Vlasenko --- sysklogd/klogd.c | 2 +- sysklogd/logread.c | 2 +- sysklogd/syslogd.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sysklogd') diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 17b6ca235..bdd0b6325 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -244,7 +244,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv) if (n < 0) { if (errno == EINTR) continue; - bb_perror_msg(READ_ERROR); + bb_simple_perror_msg(READ_ERROR); break; } start[n] = '\0'; diff --git a/sysklogd/logread.c b/sysklogd/logread.c index ea41fc0c8..1e1f1347f 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c @@ -88,7 +88,7 @@ static void error_exit(const char *str) } #else /* On Linux, shmdt is not mandatory on exit */ -# define error_exit(str) bb_perror_msg_and_die(str) +# define error_exit(str) bb_simple_perror_msg_and_die(str) #endif /* diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index d0dd1bd20..0e226124a 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -572,12 +572,12 @@ static void ipcsyslog_init(void) G.shmid = shmget(KEY_ID, G.shm_size, IPC_CREAT | 0644); if (G.shmid == -1) { - bb_perror_msg_and_die("shmget"); + bb_simple_perror_msg_and_die("shmget"); } G.shbuf = shmat(G.shmid, NULL, 0); if (G.shbuf == (void*) -1L) { /* shmat has bizarre error return */ - bb_perror_msg_and_die("shmat"); + bb_simple_perror_msg_and_die("shmat"); } memset(G.shbuf, 0, G.shm_size); @@ -592,7 +592,7 @@ static void ipcsyslog_init(void) if (G.s_semid != -1) return; } - bb_perror_msg_and_die("semget"); + bb_simple_perror_msg_and_die("semget"); } } @@ -603,7 +603,7 @@ static void log_to_shmem(const char *msg) int len; if (semop(G.s_semid, G.SMwdn, 3) == -1) { - bb_perror_msg_and_die("SMwdn"); + bb_simple_perror_msg_and_die("SMwdn"); } /* Circular Buffer Algorithm: @@ -631,7 +631,7 @@ static void log_to_shmem(const char *msg) goto again; } if (semop(G.s_semid, G.SMwup, 1) == -1) { - bb_perror_msg_and_die("SMwup"); + bb_simple_perror_msg_and_die("SMwup"); } if (DEBUG) printf("tail:%d\n", G.shbuf->tail); -- cgit v1.2.3