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>

1 files changed, 12 insertions, 12 deletions

diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 022b8721b..3e08ec011 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -582,11 +582,11 @@ static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadc
          || (dhcp_pkt->flags & htons(BROADCAST_FLAG))
          || dhcp_pkt->ciaddr == 0
         ) {
-                log1("broadcasting packet to client");
+                log1s("broadcasting packet to client");
                 ciaddr = INADDR_BROADCAST;
                 chaddr = MAC_BCAST_ADDR;
         } else {
-                log1("unicasting packet to client ciaddr");
+                log1s("unicasting packet to client ciaddr");
                 ciaddr = dhcp_pkt->ciaddr;
                 chaddr = dhcp_pkt->chaddr;
         }
@@ -600,7 +600,7 @@ static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadc
 /* Send a packet to gateway_nip using the kernel ip stack */
 static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 {
-        log1("forwarding packet to relay");
+        log1s("forwarding packet to relay");
 
         udhcp_send_kernel_packet(dhcp_pkt,
                         server_data.server_nip, SERVER_PORT,
@@ -754,7 +754,7 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                 }
 
                 if (!packet.yiaddr) {
-                        bb_error_msg("no free IP addresses. OFFER abandoned");
+                        bb_simple_error_msg("no free IP addresses. OFFER abandoned");
                         return;
                 }
                 /* Reserve the IP for a short time hoping to get DHCPREQUEST soon */
@@ -765,7 +765,7 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                                 p_host_name ? (unsigned char)p_host_name[OPT_LEN - OPT_DATA] : 0
                 );
                 if (!lease) {
-                        bb_error_msg("no free IP addresses. OFFER abandoned");
+                        bb_simple_error_msg("no free IP addresses. OFFER abandoned");
                         return;
                 }
         }
@@ -914,7 +914,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         write_pidfile(server_data.pidfile);
         /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
 
-        bb_info_msg("started, v"BB_VER);
+        bb_simple_info_msg("started, v"BB_VER);
 
         option = udhcp_find_option(server_data.options, DHCP_LEASE_TIME);
         server_data.max_lease_sec = DEFAULT_LEASE_TIME;
@@ -985,7 +985,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         if (errno == EINTR)
                                 goto new_tv;
                         /* < 0 and not EINTR: should not happen */
-                        bb_perror_msg_and_die("poll");
+                        bb_simple_perror_msg_and_die("poll");
                 }
 
                 if (pfds[0].revents) switch (udhcp_sp_read()) {
@@ -1019,16 +1019,16 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         continue;
                 }
                 if (packet.hlen != 6) {
-                        bb_info_msg("MAC length != 6, ignoring packet");
+                        bb_info_msg("MAC length != 6%s", ", ignoring packet");
                         continue;
                 }
                 if (packet.op != BOOTREQUEST) {
-                        bb_info_msg("not a REQUEST, ignoring packet");
+                        bb_info_msg("not a REQUEST%s", ", ignoring packet");
                         continue;
                 }
                 state = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
                 if (state == NULL || state[0] < DHCP_MINTYPE || state[0] > DHCP_MAXTYPE) {
-                        bb_info_msg("no or bad message type option, ignoring packet");
+                        bb_info_msg("no or bad message type option%s", ", ignoring packet");
                         continue;
                 }
 
@@ -1039,7 +1039,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         move_from_unaligned32(server_id_network_order, server_id_opt);
                         if (server_id_network_order != server_data.server_nip) {
                                 /* client talks to somebody else */
-                                log1("server ID doesn't match, ignoring");
+                                log1("server ID doesn't match%s", ", ignoring");
                                 continue;
                         }
                 }
@@ -1162,7 +1162,7 @@ o DHCPREQUEST generated during REBINDING state:
                         if (!requested_ip_opt) {
                                 requested_nip = packet.ciaddr;
                                 if (requested_nip == 0) {
-                                        log1("no requested IP and no ciaddr, ignoring");
+                                        log1("no requested IP and no ciaddr%s", ", ignoring");
                                         break;
                                 }
                         }