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>
This commit is contained in:
@@ -131,12 +131,13 @@ static int bb_alphasort(const void *p1, const void *p2)
|
||||
return (option_mask32 & OPT_r) ? -r : r;
|
||||
}
|
||||
|
||||
static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUSED_PARAM, int depth)
|
||||
static int FAST_FUNC act(struct recursive_state *state,
|
||||
const char *file, struct stat *statbuf)
|
||||
{
|
||||
if (depth == 0)
|
||||
if (state->depth == 0)
|
||||
return TRUE;
|
||||
|
||||
if (depth == 1
|
||||
if (state->depth == 1
|
||||
&& ( !(statbuf->st_mode & (S_IFREG | S_IFLNK))
|
||||
|| invalid_name(file)
|
||||
|| (!(option_mask32 & OPT_l) && access(file, X_OK) != 0))
|
||||
@@ -199,8 +200,7 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
|
||||
ACTION_RECURSE|ACTION_FOLLOWLINKS,
|
||||
act, /* file action */
|
||||
act, /* dir action */
|
||||
NULL, /* user data */
|
||||
0 /* depth */
|
||||
NULL /* user data */
|
||||
);
|
||||
|
||||
if (!names)
|
||||
|
Reference in New Issue
Block a user