aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-10-09 17:59:56 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-09 17:59:56 +0200
commite52da5570eb93d6cb2950e55c48bd22edb5a9f18 (patch)
treee76f2f6dd399a131f52e2b5951ba99e1399a2179
parent550bf5b4a418378cd8f9fbbf5252fe57acdacb5a (diff)
downloadbusybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.tar.gz
busybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.tar.bz2
busybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.zip
libbb: auto_string() for efficient handling of temporary malloced stirngs
Use it in libiproute: get rid of one static string buffer. function old new delta auto_string - 51 +51 ll_index_to_name 10 49 +39 buffer_fill_and_print 169 178 +9 scan_recursive 378 380 +2 decode_one_format 732 734 +2 cmdputs 334 332 -2 static.cur_saved 4 1 -3 static.nbuf 16 - -16 printable_string 94 57 -37 ll_idx_n2a 53 - -53 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 4/3 up/down: 103/-111) Total: -8 bytes text data bss dec hex filename 939880 992 17496 958368 e9fa0 busybox_old 939880 992 17480 958352 e9f90 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat
-rw-r--r--include/libbb.h1
-rw-r--r--libbb/auto_string.c23
-rw-r--r--libbb/printable_string.c10
-rw-r--r--networking/libiproute/ll_map.c13
-rw-r--r--networking/libiproute/ll_map.h2
5 files changed, 33 insertions, 16 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2f24ecbc3..a8ceb449c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -692,6 +692,7 @@ int bb_putchar(int ch) FAST_FUNC;
692/* Note: does not use stdio, writes to fd 2 directly */ 692/* Note: does not use stdio, writes to fd 2 directly */
693int bb_putchar_stderr(char ch) FAST_FUNC; 693int bb_putchar_stderr(char ch) FAST_FUNC;
694char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC; 694char *xasprintf(const char *format, ...) __attribute__ ((format(printf, 1, 2))) FAST_FUNC RETURNS_MALLOC;
695char *auto_string(char *str) FAST_FUNC;
695// gcc-4.1.1 still isn't good enough at optimizing it 696// gcc-4.1.1 still isn't good enough at optimizing it
696// (+200 bytes compared to macro) 697// (+200 bytes compared to macro)
697//static ALWAYS_INLINE 698//static ALWAYS_INLINE
diff --git a/libbb/auto_string.c b/libbb/auto_string.c
new file mode 100644
index 000000000..ae940069a
--- /dev/null
+++ b/libbb/auto_string.c
@@ -0,0 +1,23 @@
1/* vi: set sw=4 ts=4: */
2/*
3 * Utility routines.
4 *
5 * Copyright (C) 2015 Denys Vlasenko
6 *
7 * Licensed under GPLv2, see file LICENSE in this source tree.
8 */
9//kbuild:lib-y += auto_string.o
10
11#include "libbb.h"
12
13char* FAST_FUNC auto_string(char *str)
14{
15 static char *saved[4];
16 static uint8_t cur_saved; /* = 0 */
17
18 free(saved[cur_saved]);
19 saved[cur_saved] = str;
20 cur_saved = (cur_saved + 1) & (ARRAY_SIZE(saved)-1);
21
22 return str;
23}
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index a316f60de..077d58d32 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -11,9 +11,6 @@
11 11
12const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str) 12const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
13{ 13{
14 static char *saved[4];
15 static unsigned cur_saved; /* = 0 */
16
17 char *dst; 14 char *dst;
18 const char *s; 15 const char *s;
19 16
@@ -56,10 +53,5 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
56 } 53 }
57 } 54 }
58#endif 55#endif
59 56 return auto_string(dst);
60 free(saved[cur_saved]);
61 saved[cur_saved] = dst;
62 cur_saved = (cur_saved + 1) & (ARRAY_SIZE(saved)-1);
63
64 return dst;
65} 57}
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index feb6e8d22..e2b85fc7b 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -86,7 +86,8 @@ int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM,
86 return 0; 86 return 0;
87} 87}
88 88
89const char FAST_FUNC *ll_idx_n2a(int idx, char *buf) 89static
90const char FAST_FUNC *ll_idx_n2a(int idx/*, char *buf*/)
90{ 91{
91 struct idxmap *im; 92 struct idxmap *im;
92 93
@@ -95,15 +96,15 @@ const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
95 im = find_by_index(idx); 96 im = find_by_index(idx);
96 if (im) 97 if (im)
97 return im->name; 98 return im->name;
98 snprintf(buf, 16, "if%d", idx); 99 //snprintf(buf, 16, "if%d", idx);
99 return buf; 100 //return buf;
101 return auto_string(xasprintf("if%d", idx));
100} 102}
101 103
102const char FAST_FUNC *ll_index_to_name(int idx) 104const char FAST_FUNC *ll_index_to_name(int idx)
103{ 105{
104 static char nbuf[16]; 106 //static char nbuf[16];
105 107 return ll_idx_n2a(idx/*, nbuf*/);
106 return ll_idx_n2a(idx, nbuf);
107} 108}
108 109
109#ifdef UNUSED 110#ifdef UNUSED
diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h
index c5d383422..7ea383c81 100644
--- a/networking/libiproute/ll_map.h
+++ b/networking/libiproute/ll_map.h
@@ -7,8 +7,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
7int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC; 7int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC;
8int ll_init_map(struct rtnl_handle *rth) FAST_FUNC; 8int ll_init_map(struct rtnl_handle *rth) FAST_FUNC;
9int xll_name_to_index(const char *name) FAST_FUNC; 9int xll_name_to_index(const char *name) FAST_FUNC;
10//static: const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
10const char *ll_index_to_name(int idx) FAST_FUNC; 11const char *ll_index_to_name(int idx) FAST_FUNC;
11const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
12/* int ll_index_to_type(int idx); */ 12/* int ll_index_to_type(int idx); */
13unsigned ll_index_to_flags(int idx) FAST_FUNC; 13unsigned ll_index_to_flags(int idx) FAST_FUNC;
14 14
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-16 12:55:10 +0000