diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-01 21:52:16 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-01 21:52:16 +0200 |
| commit | 689d0650ab63425adaea26afe347015a204958ee (patch) | |
| tree | 9c2e10b952cad6804359bc10ccc963ff138fc3d4 /networking | |
| parent | 3c3928fc658bddacd4e540589868bc28a8e4ca0a (diff) | |
libbb: shrink recursive_action() by reducing memory pressure
function old new delta
recursive_action1 - 316 +316
file_action_grep 161 164 +3
add_to_prg_cache_if_socket 202 205 +3
depmod_main 509 511 +2
writeFileToTarball 488 489 +1
parse_module 281 282 +1
fileAction 207 208 +1
act 189 190 +1
add_to_dirlist 65 64 -1
writeTarFile 196 194 -2
uuidcache_init 47 45 -2
uuidcache_check_device 109 107 -2
true_action 8 6 -2
run_parts_main 310 308 -2
netstat_main 534 532 -2
lsusb_main 29 27 -2
lspci_main 45 43 -2
initial_scan 138 136 -2
grep_main 845 843 -2
find_main 482 480 -2
config_file_action 437 435 -2
chmod_main 142 140 -2
dirAction 14 10 -4
diff_main 1544 1540 -4
chown_main 154 148 -6
skip_dir 136 129 -7
dir_act 191 184 -7
recursive_action 453 69 -384
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 7/20 up/down: 328/-439) Total: -111 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/netstat.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/networking/netstat.c b/networking/netstat.c index 936610f89..3ab7b0d21 100644 --- a/networking/netstat.c +++ b/networking/netstat.c @@ -272,10 +272,9 @@ static long extract_socket_inode(const char *lname) return inode; } -static int FAST_FUNC add_to_prg_cache_if_socket(const char *fileName, - struct stat *statbuf UNUSED_PARAM, - void *pid_slash_progname, - int depth UNUSED_PARAM) +static int FAST_FUNC add_to_prg_cache_if_socket(struct recursive_state *state, + const char *fileName, + struct stat *statbuf UNUSED_PARAM) { char *linkname; long inode; @@ -284,16 +283,17 @@ static int FAST_FUNC add_to_prg_cache_if_socket(const char *fileName, if (linkname != NULL) { inode = extract_socket_inode(linkname); free(linkname); - if (inode >= 0) - prg_cache_add(inode, (char *)pid_slash_progname); + if (inode >= 0) { + char *pid_slash_progname = state->userData; + prg_cache_add(inode, pid_slash_progname); + } } return TRUE; } -static int FAST_FUNC dir_act(const char *fileName, - struct stat *statbuf UNUSED_PARAM, - void *userData UNUSED_PARAM, - int depth) +static int FAST_FUNC dir_act(struct recursive_state *state, + const char *fileName, + struct stat *statbuf UNUSED_PARAM) { const char *pid; char *pid_slash_progname; @@ -301,7 +301,7 @@ static int FAST_FUNC dir_act(const char *fileName, char cmdline_buf[512]; int n, len; - if (depth == 0) /* "/proc" itself */ + if (state->depth == 0) /* "/proc" itself */ return TRUE; /* continue looking one level below /proc */ pid = fileName + sizeof("/proc/")-1; /* point after "/proc/" */ @@ -321,8 +321,8 @@ static int FAST_FUNC dir_act(const char *fileName, ACTION_RECURSE | ACTION_QUIET, add_to_prg_cache_if_socket, NULL, - (void *)pid_slash_progname, - 0); + (void *)pid_slash_progname + ); free(pid_slash_progname); if (!n) @@ -337,7 +337,7 @@ static void prg_cache_load(void) prg_cache_loaded = 1; load_ok = recursive_action("/proc", ACTION_RECURSE | ACTION_QUIET, - NULL, dir_act, NULL, 0); + NULL, dir_act, NULL); if (load_ok) return; |