summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko2020-10-01 21:52:16 +0200
committerDenys Vlasenko2020-10-01 21:52:16 +0200
commit689d0650ab63425adaea26afe347015a204958ee (patch)
tree9c2e10b952cad6804359bc10ccc963ff138fc3d4 /archival
parent3c3928fc658bddacd4e540589868bc28a8e4ca0a (diff)
downloadbusybox-689d0650ab63425adaea26afe347015a204958ee.zip
busybox-689d0650ab63425adaea26afe347015a204958ee.tar.gz
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 'archival')
-rw-r--r--archival/tar.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 4f25648..93184cc 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -491,10 +491,11 @@ static int exclude_file(const llist_t *excluded_files, const char *file)
# define exclude_file(excluded_files, file) 0
# endif
-static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
- void *userData, int depth UNUSED_PARAM)
+static int FAST_FUNC writeFileToTarball(struct recursive_state *state,
+ const char *fileName,
+ struct stat *statbuf)
{
- struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
+ struct TarBallInfo *tbInfo = (struct TarBallInfo *) state->userData;
const char *header_name;
int inputFileFd = -1;
@@ -700,7 +701,7 @@ static NOINLINE int writeTarFile(
/* Read the directory/files and iterate over them one at a time */
while (filelist) {
if (!recursive_action(filelist->data, recurseFlags,
- writeFileToTarball, writeFileToTarball, tbInfo, 0)
+ writeFileToTarball, writeFileToTarball, tbInfo)
) {
errorFlag = TRUE;
}