emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: shrink recursive_action() by reducing memory pressure

Browse Source 
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:
Denys Vlasenko
2020-10-01 21:52:16 +02:00
parent 3c3928fc65
commit 689d0650ab
19 changed files with 159 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modutils/depmod.c
View File

@@ -32,10 +32,11 @@
* for each depends, look through our list of full paths and emit if found
*/
static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,
void *data, int depth UNUSED_PARAM)
static int FAST_FUNC parse_module(struct recursive_state *state,
const char *fname,
struct stat *sb UNUSED_PARAM)
{
module_db *modules = data;
module_db *modules = state->userData;
char *image, *ptr;
module_entry *e;
@@ -201,11 +202,12 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
memset(&modules, 0, sizeof(modules));
if (*argv) {
do {
parse_module(*argv, /*sb (unused):*/ NULL, &modules, 0);
recursive_action(*argv, 0 /* no ACTION_RECURSE! */,
parse_module, NULL, &modules);
} while (*++argv);
} else {
recursive_action(".", ACTION_RECURSE,
parse_module, NULL, &modules, 0);
parse_module, NULL, &modules);
}
/* Generate dependency and alias files */

3
modutils/modprobe-small.c
View File

@@ -751,8 +751,7 @@ static int process_module(char *name, const char *cmdline_options)
ACTION_RECURSE, /* flags */
fileAction, /* file action */
NULL, /* dir action */
name, /* user data */
0 /* depth */
name /* user data */
);
dbg1_error_msg("dirscan complete");
/* Module was not found, or load failed, or is_remove */

14
modutils/modprobe.c
View File

@@ -235,10 +235,9 @@ static void add_probe(const char *name)
}
}
static int FAST_FUNC config_file_action(const char *filename,
struct stat *statbuf UNUSED_PARAM,
void *userdata UNUSED_PARAM,
int depth)
static int FAST_FUNC config_file_action(struct recursive_state *state,
const char *filename,
struct stat *statbuf UNUSED_PARAM)
{
char *tokens[3];
parser_t *p;
@@ -255,7 +254,7 @@ static int FAST_FUNC config_file_action(const char *filename,
* that we shouldn't recurse into /etc/modprobe.d/dir/
* _subdirectories_:
*/
if (depth > 1)
if (state->depth > 1)
return SKIP; /* stop recursing */
//TODO: instead, can use dirAction in recursive_action() to SKIP dirs
//on depth == 1 level. But that's more code...
@@ -264,7 +263,7 @@ static int FAST_FUNC config_file_action(const char *filename,
* depth==0: read_config("modules.{symbols,alias}") must work,
* "include FILE_NOT_ENDING_IN_CONF" must work too.
*/
if (depth != 0) {
if (state->depth != 0) {
if (!is_suffixed_with(base, ".conf"))
goto error;
}
@@ -329,8 +328,7 @@ static int FAST_FUNC config_file_action(const char *filename,
static int read_config(const char *path)
{
return recursive_action(path, ACTION_RECURSE | ACTION_QUIET,
config_file_action, NULL, NULL,
/*depth:*/ 0);
config_file_action, NULL, NULL);
}
static const char *humanly_readable_name(struct module_entry *m)