diff options
| author | Denys Vlasenko | 2016-04-21 16:26:30 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2016-04-21 17:39:11 +0200 |
| commit | e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a (patch) | |
| tree | 0962142ac9830312cd3df52994db41e8ac47c73c /sysklogd | |
| parent | 5598bdf0d3d46a865a4d23785e2d09e6db9be420 (diff) | |
| download | busybox-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.zip busybox-e6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a.tar.gz | |
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 'sysklogd')
| -rw-r--r-- | sysklogd/klogd.c | 6 | ||||
| -rw-r--r-- | sysklogd/logread.c | 3 | ||||
| -rw-r--r-- | sysklogd/syslogd_and_logger.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 03d65b3..845c49a 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -58,6 +58,7 @@ //usage: "\n -n Run in foreground" #include "libbb.h" +#include "common_bufsiz.h" #include <syslog.h> @@ -145,9 +146,10 @@ static void klogd_close(void) #endif -#define log_buffer bb_common_bufsiz1 +#define log_buffer bb_common_bufsiz1 +#define sizeof_log_buffer COMMON_BUFSIZE enum { - KLOGD_LOGBUF_SIZE = sizeof(log_buffer), + KLOGD_LOGBUF_SIZE = sizeof_log_buffer, OPT_LEVEL = (1 << 0), OPT_FOREGROUND = (1 << 1), }; diff --git a/sysklogd/logread.c b/sysklogd/logread.c index 781a603..ebd7f8b 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c @@ -42,6 +42,7 @@ //usage: "\n -F Same as -f, but dump buffer first" #include "libbb.h" +#include "common_bufsiz.h" #include <sys/ipc.h> #include <sys/sem.h> #include <sys/shm.h> @@ -67,7 +68,7 @@ struct globals { struct sembuf SMrdn[2]; // {1, 0}, {0, +1, SEM_UNDO} struct shbuf_ds *shbuf; } FIX_ALIASING; -#define G (*(struct globals*)&bb_common_bufsiz1) +#define G (*(struct globals*)bb_common_bufsiz1) #define SMrup (G.SMrup) #define SMrdn (G.SMrdn) #define shbuf (G.shbuf) diff --git a/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c index 0964f23..6458a93 100644 --- a/sysklogd/syslogd_and_logger.c +++ b/sysklogd/syslogd_and_logger.c @@ -8,6 +8,7 @@ */ #include "libbb.h" +#include "common_bufsiz.h" #define SYSLOG_NAMES #define SYSLOG_NAMES_CONST #include <syslog.h> |