diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 16:26:30 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-04-21 17:39:11 +0200 |
commit | e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a (patch) | |
tree | 0962142ac9830312cd3df52994db41e8ac47c73c /miscutils/conspy.c | |
parent | 5598bdf0d3d46a865a4d23785e2d09e6db9be420 (diff) | |
download | busybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.tar.gz busybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.tar.bz2 busybox-w32-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.zip |
libbb: make bb_common_bufsiz1 1 kbyte, add capability to use bss tail for it
The config item is FEATURE_USE_BSS_TAIL. When it is off (default):
function old new delta
read_config 210 228 +18
doCommands 2279 2294 +15
ipneigh_list_or_flush 763 772 +9
ipaddr_list_or_flush 1256 1261 +5
display_process_list 1301 1306 +5
conspy_main 1378 1383 +5
do_lzo_compress 352 355 +3
do_lzo_decompress 565 567 +2
push 46 44 -2
inetd_main 2136 2134 -2
uevent_main 421 418 -3
addLines 97 92 -5
bb_common_bufsiz1 8193 1024 -7169
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 8/5 up/down: 62/-7181) Total: -7119 bytes
text data bss dec hex filename
829850 4086 9080 843016 cdd08 busybox_old
829901 4086 1904 835891 cc133 busybox_unstripped
FEATURE_USE_BSS_TAIL=y:
read_config 210 228 +18
doCommands 2279 2294 +15
ipneigh_list_or_flush 763 772 +9
ipaddr_list_or_flush 1256 1261 +5
display_process_list 1301 1306 +5
conspy_main 1378 1383 +5
do_lzo_compress 352 355 +3
do_lzo_decompress 565 567 +2
inetd_main 2136 2134 -2
bb_common_bufsiz1 8193 - -8193
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 8/1 up/down: 62/-8195) Total: -8133 bytes
text data bss dec hex filename
829850 4086 9080 843016 cdd08 busybox_old
829911 4086 880 834877 cbd3d busybox_unstripped
FIXME: setup_common_bufsiz() calls are missing.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils/conspy.c')
-rw-r--r-- | miscutils/conspy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/miscutils/conspy.c b/miscutils/conspy.c index 1a46a4340..0d96a5f9a 100644 --- a/miscutils/conspy.c +++ b/miscutils/conspy.c | |||
@@ -42,6 +42,7 @@ | |||
42 | //usage: "\n -y LINE Starting line" | 42 | //usage: "\n -y LINE Starting line" |
43 | 43 | ||
44 | #include "libbb.h" | 44 | #include "libbb.h" |
45 | #include "common_bufsiz.h" | ||
45 | #include <sys/kd.h> | 46 | #include <sys/kd.h> |
46 | 47 | ||
47 | #define ESC "\033" | 48 | #define ESC "\033" |
@@ -363,7 +364,8 @@ int conspy_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |||
363 | int conspy_main(int argc UNUSED_PARAM, char **argv) | 364 | int conspy_main(int argc UNUSED_PARAM, char **argv) |
364 | { | 365 | { |
365 | char tty_name[sizeof(DEV_TTY "NN")]; | 366 | char tty_name[sizeof(DEV_TTY "NN")]; |
366 | #define keybuf bb_common_bufsiz1 | 367 | #define keybuf bb_common_bufsiz1 |
368 | #define sizeof_keybuf COMMON_BUFSIZE | ||
367 | struct termios termbuf; | 369 | struct termios termbuf; |
368 | unsigned opts; | 370 | unsigned opts; |
369 | unsigned ttynum; | 371 | unsigned ttynum; |
@@ -513,7 +515,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv) | |||
513 | default: | 515 | default: |
514 | // Read the keys pressed | 516 | // Read the keys pressed |
515 | k = keybuf + G.key_count; | 517 | k = keybuf + G.key_count; |
516 | bytes_read = read(G.kbd_fd, k, sizeof(keybuf) - G.key_count); | 518 | bytes_read = read(G.kbd_fd, k, sizeof_keybuf - G.key_count); |
517 | if (bytes_read < 0) | 519 | if (bytes_read < 0) |
518 | goto abort; | 520 | goto abort; |
519 | 521 | ||