diff options
author | Tavian Barnes <tavianator@tavianator.com> | 2024-05-23 14:28:02 -0400 |
---|---|---|
committer | Tavian Barnes <tavianator@tavianator.com> | 2024-05-23 14:34:33 -0400 |
commit | 65a7814b2dbc10ea86610092f03d0c1df95d08ad (patch) | |
tree | 3075cb84811b6be8dba357f96dcbbf955905b2e3 | |
parent | 07b0c50e94543a88f699fa60b577d8e53c978ff1 (diff) | |
download | bfs-65a7814b2dbc10ea86610092f03d0c1df95d08ad.tar.xz |
opt: Don't raise RLIMIT_NOFILE if it would prevent using posix_spawn()
If we raise RLIMIT_NOFILE, we have to lower it before calling exec() for
compatibility with select(). If posix_spawn() doesn't support that, we
fall back to fork(), which is quite a bit slower.
Therefore, if we're going to exec() on most files, it's better to keep
RLIMIT_NOFILE the same to avoid the fork() cost, even though it makes
bftw() somewhat slower.
-rw-r--r-- | src/ctx.c | 1 | ||||
-rw-r--r-- | src/ctx.h | 2 | ||||
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/opt.c | 16 |
4 files changed, 22 insertions, 0 deletions
@@ -56,6 +56,7 @@ struct bfs_ctx *bfs_ctx_new(void) { goto fail; } ctx->cur_nofile = ctx->orig_nofile; + ctx->raise_nofile = true; ctx->users = bfs_users_new(); if (!ctx->users) { @@ -102,6 +102,8 @@ struct bfs_ctx { struct rlimit orig_nofile; /** The current RLIMIT_NOFILE limits. */ struct rlimit cur_nofile; + /** Whether the fd limit should be raised. */ + bool raise_nofile; /** The current time. */ struct timespec now; @@ -1466,6 +1466,9 @@ done: static int raise_fdlimit(struct bfs_ctx *ctx) { rlim_t cur = ctx->orig_nofile.rlim_cur; rlim_t max = ctx->orig_nofile.rlim_max; + if (!ctx->raise_nofile) { + max = cur; + } rlim_t target = 64 << 10; if (rlim_cmp(target, max) > 0) { @@ -2221,6 +2221,11 @@ static float estimate_stat_odds(struct bfs_ctx *ctx) { return 1.0 - nostat_odds; } +/** Matches -(exec|ok) ... \; */ +static bool single_exec(const struct bfs_expr *expr) { + return expr->eval_fn == eval_exec && !(expr->exec->flags & BFS_EXEC_MULTI); +} + int bfs_optimize(struct bfs_ctx *ctx) { bfs_ctx_dump(ctx, DEBUG_OPT); @@ -2299,6 +2304,17 @@ int bfs_optimize(struct bfs_ctx *ctx) { opt_leave(&opt, "eager stat cost: ${ylw}%g${rs}\n", eager_cost); } +#ifndef POSIX_SPAWN_SETRLIMIT + // If bfs_spawn_setrlimit() would force us to use fork() over + // posix_spawn(), the extra cost may outweigh the benefit of a + // higher RLIMIT_NOFILE + float single_exec_odds = estimate_odds(ctx->expr, single_exec); + if (single_exec_odds >= 0.5) { + opt_enter(&opt, "single ${blu}-exec${rs} odds: ${ylw}%g${rs}\n", single_exec_odds); + ctx->raise_nofile = false; + opt_leave(&opt, "not raising RLIMIT_NOFILE\n"); + } +#endif } opt_leave(&opt, NULL); |