aboutsummaryrefslogtreecommitdiff
path: root/console-tools
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 /console-tools
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 'console-tools')
-rw-r--r--console-tools/loadfont.c20
-rw-r--r--console-tools/loadkmap.c2
-rw-r--r--console-tools/openvt.c4
-rw-r--r--console-tools/showkey.c2
4 files changed, 14 insertions, 14 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index b5d4e8f43..caad7d9ac 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -225,7 +225,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
225 if (unicode == PSF2_SEPARATOR) { 225 if (unicode == PSF2_SEPARATOR) {
226 break; 226 break;
227 } else if (unicode == PSF2_STARTSEQ) { 227 } else if (unicode == PSF2_STARTSEQ) {
228 bb_error_msg_and_die("unicode sequences not implemented"); 228 bb_simple_error_msg_and_die("unicode sequences not implemented");
229 } else if (unicode >= 0xC0) { 229 } else if (unicode >= 0xC0) {
230 if (unicode >= 0xFC) 230 if (unicode >= 0xFC)
231 unicode &= 0x01, maxct = 5; 231 unicode &= 0x01, maxct = 5;
@@ -239,12 +239,12 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
239 unicode &= 0x1F, maxct = 1; 239 unicode &= 0x1F, maxct = 1;
240 do { 240 do {
241 if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF) 241 if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF)
242 bb_error_msg_and_die("illegal UTF-8 character"); 242 bb_simple_error_msg_and_die("illegal UTF-8 character");
243 --tailsz; 243 --tailsz;
244 unicode = (unicode << 6) + (*inbuf++ & 0x3F); 244 unicode = (unicode << 6) + (*inbuf++ & 0x3F);
245 } while (--maxct > 0); 245 } while (--maxct > 0);
246 } else if (unicode >= 0x80) { 246 } else if (unicode >= 0x80) {
247 bb_error_msg_and_die("illegal UTF-8 character"); 247 bb_simple_error_msg_and_die("illegal UTF-8 character");
248 } 248 }
249#else 249#else
250 return; 250 return;
@@ -281,7 +281,7 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
281 281
282 if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) { 282 if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) {
283 if (psf1h(buffer)->mode > PSF1_MAXMODE) 283 if (psf1h(buffer)->mode > PSF1_MAXMODE)
284 bb_error_msg_and_die("unsupported psf file mode"); 284 bb_simple_error_msg_and_die("unsupported psf file mode");
285 if (psf1h(buffer)->mode & PSF1_MODE512) 285 if (psf1h(buffer)->mode & PSF1_MODE512)
286 fontsize = 512; 286 fontsize = 512;
287 if (psf1h(buffer)->mode & PSF1_MODEHASTAB) 287 if (psf1h(buffer)->mode & PSF1_MODEHASTAB)
@@ -292,7 +292,7 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
292#if ENABLE_FEATURE_LOADFONT_PSF2 292#if ENABLE_FEATURE_LOADFONT_PSF2
293 if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) { 293 if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) {
294 if (psf2h(buffer)->version > PSF2_MAXVERSION) 294 if (psf2h(buffer)->version > PSF2_MAXVERSION)
295 bb_error_msg_and_die("unsupported psf file version"); 295 bb_simple_error_msg_and_die("unsupported psf file version");
296 fontsize = psf2h(buffer)->length; 296 fontsize = psf2h(buffer)->length;
297 if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE) 297 if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE)
298 has_table = 2; 298 has_table = 2;
@@ -311,19 +311,19 @@ static void do_load(int fd, unsigned char *buffer, size_t len)
311 } else 311 } else
312#endif 312#endif
313 { 313 {
314 bb_error_msg_and_die("input file: bad length or unsupported font type"); 314 bb_simple_error_msg_and_die("input file: bad length or unsupported font type");
315 } 315 }
316 316
317#if !defined(PIO_FONTX) || defined(__sparc__) 317#if !defined(PIO_FONTX) || defined(__sparc__)
318 if (fontsize != 256) 318 if (fontsize != 256)
319 bb_error_msg_and_die("only fontsize 256 supported"); 319 bb_simple_error_msg_and_die("only fontsize 256 supported");
320#endif 320#endif
321 321
322 table = font + fontsize * charsize; 322 table = font + fontsize * charsize;
323 buffer += len; 323 buffer += len;
324 324
325 if (table > buffer || (!has_table && table != buffer)) 325 if (table > buffer || (!has_table && table != buffer))
326 bb_error_msg_and_die("input file: bad length"); 326 bb_simple_error_msg_and_die("input file: bad length");
327 327
328 do_loadfont(fd, font, height, width, charsize, fontsize); 328 do_loadfont(fd, font, height, width, charsize, fontsize);
329 329
@@ -361,7 +361,7 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
361 buffer = xmalloc_read(STDIN_FILENO, &len); 361 buffer = xmalloc_read(STDIN_FILENO, &len);
362 // xmalloc_open_zipped_read_close(filename, &len); 362 // xmalloc_open_zipped_read_close(filename, &len);
363 if (!buffer) 363 if (!buffer)
364 bb_perror_msg_and_die("error reading input font"); 364 bb_simple_perror_msg_and_die("error reading input font");
365 do_load(get_console_fd_or_die(), buffer, len); 365 do_load(get_console_fd_or_die(), buffer, len);
366 366
367 return EXIT_SUCCESS; 367 return EXIT_SUCCESS;
@@ -502,7 +502,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
502 if (a < 0 || a >= E_TABSZ 502 if (a < 0 || a >= E_TABSZ
503 || b < 0 || b > 65535 503 || b < 0 || b > 65535
504 ) { 504 ) {
505 bb_error_msg_and_die("map format"); 505 bb_simple_error_msg_and_die("map format");
506 } 506 }
507 // patch map 507 // patch map
508 unicodes[a] = b; 508 unicodes[a] = b;
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index d4981ad21..91ef50884 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -69,7 +69,7 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv)
69 69
70 xread(STDIN_FILENO, flags, 7); 70 xread(STDIN_FILENO, flags, 7);
71 if (!is_prefixed_with(flags, BINARY_KEYMAP_MAGIC)) 71 if (!is_prefixed_with(flags, BINARY_KEYMAP_MAGIC))
72 bb_error_msg_and_die("not a valid binary keymap"); 72 bb_simple_error_msg_and_die("not a valid binary keymap");
73 73
74 xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS); 74 xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS);
75 75
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index b01229a56..9e6cffecc 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -87,7 +87,7 @@ static int get_vt_fd(void)
87 fd = open(DEV_CONSOLE, O_RDONLY | O_NONBLOCK); 87 fd = open(DEV_CONSOLE, O_RDONLY | O_NONBLOCK);
88 if (fd >= 0 && !not_vt_fd(fd)) 88 if (fd >= 0 && !not_vt_fd(fd))
89 return fd; 89 return fd;
90 bb_error_msg_and_die("can't find open VT"); 90 bb_simple_error_msg_and_die("can't find open VT");
91} 91}
92 92
93static int find_free_vtno(void) 93static int find_free_vtno(void)
@@ -98,7 +98,7 @@ static int find_free_vtno(void)
98 errno = 0; 98 errno = 0;
99 /*xfunc_error_retval = 3; - do we need compat? */ 99 /*xfunc_error_retval = 3; - do we need compat? */
100 if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0) 100 if (ioctl(fd, VT_OPENQRY, &vtno) != 0 || vtno <= 0)
101 bb_perror_msg_and_die("can't find open VT"); 101 bb_simple_perror_msg_and_die("can't find open VT");
102// Not really needed, grep for DAEMON_CLOSE_EXTRA_FDS 102// Not really needed, grep for DAEMON_CLOSE_EXTRA_FDS
103// if (fd > 2) 103// if (fd > 2)
104// close(fd); 104// close(fd);
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index c322ce99d..8f0e9d938 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -56,7 +56,7 @@ static void xset1(struct termios *t)
56{ 56{
57 int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t); 57 int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, t);
58 if (ret) { 58 if (ret) {
59 bb_perror_msg("can't tcsetattr for stdin"); 59 bb_simple_perror_msg("can't tcsetattr for stdin");
60 } 60 }
61} 61}
62 62