aboutsummaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
authorJames Byrne <james.byrne@origamienergy.com>2019-07-02 11:35:03 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2019-07-02 11:35:03 +0200
commit6937487be73cd4563b876413277a295a5fe2f32c (patch)
treef16cc9999a7c827891e6ec8d99c699fc791008ee /runit
parentcaecfdc20d450686cd1f7e9b5f650322f894b3c2 (diff)
downloadbusybox-w32-6937487be73cd4563b876413277a295a5fe2f32c.tar.gz
busybox-w32-6937487be73cd4563b876413277a295a5fe2f32c.tar.bz2
busybox-w32-6937487be73cd4563b876413277a295a5fe2f32c.zip
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 <james.byrne@origamienergy.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'runit')
-rw-r--r--runit/chpst.c6
-rw-r--r--runit/svlogd.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/runit/chpst.c b/runit/chpst.c
index 5e77245f6..af777568f 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -270,7 +270,7 @@ static void limit(int what, long l)
270 else 270 else
271 r.rlim_cur = l; 271 r.rlim_cur = l;
272 if (setrlimit(what, &r) == -1) 272 if (setrlimit(what, &r) == -1)
273 bb_perror_msg_and_die("setrlimit"); 273 bb_simple_perror_msg_and_die("setrlimit");
274} 274}
275 275
276int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 276int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -467,12 +467,12 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
467 if (opt & OPT_n) { 467 if (opt & OPT_n) {
468 errno = 0; 468 errno = 0;
469 if (nice(xatoi(nicestr)) == -1) 469 if (nice(xatoi(nicestr)) == -1)
470 bb_perror_msg_and_die("nice"); 470 bb_simple_perror_msg_and_die("nice");
471 } 471 }
472 472
473 if (opt & OPT_u) { 473 if (opt & OPT_u) {
474 if (setgroups(1, &ugid.gid) == -1) 474 if (setgroups(1, &ugid.gid) == -1)
475 bb_perror_msg_and_die("setgroups"); 475 bb_simple_perror_msg_and_die("setgroups");
476 xsetgid(ugid.gid); 476 xsetgid(ugid.gid);
477 xsetuid(ugid.uid); 477 xsetuid(ugid.uid);
478 } 478 }
diff --git a/runit/svlogd.c b/runit/svlogd.c
index c9e5346d1..a250058a1 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -274,7 +274,7 @@ static void warnx(const char *m0, const char *m1)
274} 274}
275static void pause_nomem(void) 275static void pause_nomem(void)
276{ 276{
277 bb_error_msg(PAUSE"out of memory"); 277 bb_simple_error_msg(PAUSE"out of memory");
278 sleep(3); 278 sleep(3);
279} 279}
280static void pause1cannot(const char *m0) 280static void pause1cannot(const char *m0)