aboutsummaryrefslogtreecommitdiff
path: root/procps/nmeter.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 16:26:30 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-04-21 17:39:11 +0200
commite6a2f4cc5a47d3022bdf5ca2cacbaa5a8c5baf7a (patch)
tree0962142ac9830312cd3df52994db41e8ac47c73c /procps/nmeter.c
parent5598bdf0d3d46a865a4d23785e2d09e6db9be420 (diff)
downloadbusybox-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 'procps/nmeter.c')
-rw-r--r--procps/nmeter.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 33de3790f..efa3d553d 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -53,6 +53,7 @@
53// totalswap=134209536, freeswap=134209536, procs=157}) 53// totalswap=134209536, freeswap=134209536, procs=157})
54 54
55#include "libbb.h" 55#include "libbb.h"
56#include "common_bufsiz.h"
56 57
57typedef unsigned long long ullong; 58typedef unsigned long long ullong;
58 59
@@ -115,8 +116,8 @@ struct globals {
115 G.deltanz = G.delta = 1000000; \ 116 G.deltanz = G.delta = 1000000; \
116} while (0) 117} while (0)
117 118
118// We depend on this being a char[], not char* - we take sizeof() of it 119#define outbuf bb_common_bufsiz1
119#define outbuf bb_common_bufsiz1 120#define sizeof_outbuf COMMON_BUFSIZE
120 121
121static inline void reset_outbuf(void) 122static inline void reset_outbuf(void)
122{ 123{
@@ -140,7 +141,7 @@ static void print_outbuf(void)
140static void put(const char *s) 141static void put(const char *s)
141{ 142{
142 char *p = cur_outbuf; 143 char *p = cur_outbuf;
143 int sz = outbuf + sizeof(outbuf) - p; 144 int sz = outbuf + sizeof_outbuf - p;
144 while (*s && --sz >= 0) 145 while (*s && --sz >= 0)
145 *p++ = *s++; 146 *p++ = *s++;
146 cur_outbuf = p; 147 cur_outbuf = p;
@@ -148,7 +149,7 @@ static void put(const char *s)
148 149
149static void put_c(char c) 150static void put_c(char c)
150{ 151{
151 if (cur_outbuf < outbuf + sizeof(outbuf)) 152 if (cur_outbuf < outbuf + sizeof_outbuf)
152 *cur_outbuf++ = c; 153 *cur_outbuf++ = c;
153} 154}
154 155