aboutsummaryrefslogtreecommitdiff
path: root/networking/nc_bloaty.c
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 /networking/nc_bloaty.c
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 'networking/nc_bloaty.c')
-rw-r--r--networking/nc_bloaty.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 42c84de45..034e03d21 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -198,8 +198,8 @@ enum {
198#define Debug(...) do { } while (0) 198#define Debug(...) do { } while (0)
199#endif 199#endif
200 200
201#define holler_error(...) do { if (o_verbose) bb_error_msg(__VA_ARGS__); } while (0) 201#define holler_error(msg) do { if (o_verbose) bb_simple_error_msg(msg); } while (0)
202#define holler_perror(...) do { if (o_verbose) bb_perror_msg(__VA_ARGS__); } while (0) 202#define holler_perror(msg) do { if (o_verbose) bb_simple_perror_msg(msg); } while (0)
203 203
204/* catch: no-brainer interrupt handler */ 204/* catch: no-brainer interrupt handler */
205static void catch(int sig) 205static void catch(int sig)
@@ -361,10 +361,10 @@ static void dolisten(int is_persistent, char **proggie)
361 rr = recv_from_to(netfd, NULL, 0, MSG_PEEK, /*was bigbuf_net, BIGSIZ*/ 361 rr = recv_from_to(netfd, NULL, 0, MSG_PEEK, /*was bigbuf_net, BIGSIZ*/
362 &remend.u.sa, &ouraddr->u.sa, ouraddr->len); 362 &remend.u.sa, &ouraddr->u.sa, ouraddr->len);
363 if (rr < 0) 363 if (rr < 0)
364 bb_perror_msg_and_die("recvfrom"); 364 bb_simple_perror_msg_and_die("recvfrom");
365 unarm(); 365 unarm();
366 } else 366 } else
367 bb_error_msg_and_die("timeout"); 367 bb_simple_error_msg_and_die("timeout");
368/* Now we learned *to which IP* peer has connected, and we want to anchor 368/* Now we learned *to which IP* peer has connected, and we want to anchor
369our socket on it, so that our outbound packets will have correct local IP. 369our socket on it, so that our outbound packets will have correct local IP.
370Unfortunately, bind() on already bound socket will fail now (EINVAL): 370Unfortunately, bind() on already bound socket will fail now (EINVAL):
@@ -382,7 +382,7 @@ create new one, and bind() it. TODO */
382 remend.len = LSA_SIZEOF_SA; 382 remend.len = LSA_SIZEOF_SA;
383 rr = accept(netfd, &remend.u.sa, &remend.len); 383 rr = accept(netfd, &remend.u.sa, &remend.len);
384 if (rr < 0) 384 if (rr < 0)
385 bb_perror_msg_and_die("accept"); 385 bb_simple_perror_msg_and_die("accept");
386 if (themaddr) { 386 if (themaddr) {
387 int sv_port, port, r; 387 int sv_port, port, r;
388 388
@@ -409,7 +409,7 @@ create new one, and bind() it. TODO */
409 } 409 }
410 unarm(); 410 unarm();
411 } else 411 } else
412 bb_error_msg_and_die("timeout"); 412 bb_simple_error_msg_and_die("timeout");
413 413
414 if (is_persistent && proggie) { 414 if (is_persistent && proggie) {
415 /* -l -k -e PROG */ 415 /* -l -k -e PROG */
@@ -494,7 +494,7 @@ static int udptest(void)
494 494
495 rr = write(netfd, bigbuf_in, 1); 495 rr = write(netfd, bigbuf_in, 1);
496 if (rr != 1) 496 if (rr != 1)
497 bb_perror_msg("udptest first write"); 497 bb_simple_perror_msg("udptest first write");
498 498
499 if (o_wait) 499 if (o_wait)
500 sleep(o_wait); // can be interrupted! while (t) nanosleep(&t)? 500 sleep(o_wait); // can be interrupted! while (t) nanosleep(&t)?
@@ -644,7 +644,7 @@ static int readwrite(void)
644 if (rr <= 0) { 644 if (rr <= 0) {
645 if (rr < 0 && o_verbose > 1) { 645 if (rr < 0 && o_verbose > 1) {
646 /* nc 1.10 doesn't do this */ 646 /* nc 1.10 doesn't do this */
647 bb_perror_msg("net read"); 647 bb_simple_perror_msg("net read");
648 } 648 }
649 pfds[1].fd = -1; /* don't poll for netfd anymore */ 649 pfds[1].fd = -1; /* don't poll for netfd anymore */
650 fds_open--; 650 fds_open--;
@@ -869,7 +869,7 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
869 /* apparently UDP can listen ON "port 0", 869 /* apparently UDP can listen ON "port 0",
870 but that's not useful */ 870 but that's not useful */
871 if (!o_lport) 871 if (!o_lport)
872 bb_error_msg_and_die("UDP listen needs nonzero -p port"); 872 bb_simple_error_msg_and_die("UDP listen needs nonzero -p port");
873 } 873 }
874#endif 874#endif
875 875