diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/evanix.c | 8 | ||||
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | src/queue.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/evanix.c b/src/evanix.c index d46a366..2cf8469 100644 --- a/src/evanix.c +++ b/src/evanix.c @@ -19,7 +19,7 @@ static const char usage[] = " -d, --dry-run Show what derivations would be " "built.\n" " -s, --system System to build for.\n" - " -m, --max-build Max number of builds.\n" + " -m, --max-builds Max number of builds.\n" " -b, --break-evanix Enable experimental features.\n" " -r, --solver-report Print solver report.\n" " -p, --pipelined <bool> Use evanix build pipeline.\n" @@ -33,7 +33,7 @@ struct evanix_opts_t evanix_opts = { .isflake = false, .ispipelined = true, .isdryrun = false, - .max_build = 0, + .max_builds = 0, .system = NULL, .solver_report = false, .check_cache_status = true, @@ -139,8 +139,8 @@ int opts_read(struct evanix_opts_t *opts, char **expr, int argc, char *argv[]) {"solver", required_argument, NULL, 'k'}, {"system", required_argument, NULL, 's'}, {"solver-report", no_argument, NULL, 'r'}, - {"max-build", required_argument, NULL, 'm'}, {"pipelined", required_argument, NULL, 'p'}, + {"max-builds", required_argument, NULL, 'm'}, {"close-unused-fd", required_argument, NULL, 'c'}, {"check-cache-status", required_argument, NULL, 'l'}, {NULL, 0, NULL, 0}, @@ -197,7 +197,7 @@ int opts_read(struct evanix_opts_t *opts, char **expr, int argc, char *argv[]) return -EINVAL; } - opts->max_build = ret; + opts->max_builds = ret; break; case 'p': ret = atob(optarg); diff --git a/src/meson.build b/src/meson.build index 4217858..4894e1c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -24,7 +24,7 @@ foreach solver : ['sjf', 'highs', 'conformity'] test(f'evanix-@solver@', e, args: [ '--dry-run', '--close-unused-fd=false', - '--max-build=3', + '--max-builds=3', '--solver-report', f'--solver=@solver@', '--flake', diff --git a/src/queue.c b/src/queue.c index b914d0f..dbccd66 100644 --- a/src/queue.c +++ b/src/queue.c @@ -102,7 +102,7 @@ int queue_pop(struct queue *queue, struct job **job) } pthread_mutex_lock(&queue->mutex); - if (evanix_opts.max_build) { + if (evanix_opts.max_builds) { ret = evanix_opts.solver(&j, &queue->jobs, queue->resources); if (ret < 0) goto out_mutex_unlock; @@ -242,7 +242,7 @@ int queue_thread_new(struct queue_thread **queue_thread, FILE *stream) goto out_free_qt; } qt->queue->htab = NULL; - qt->queue->resources = evanix_opts.max_build; + qt->queue->resources = evanix_opts.max_builds; qt->queue->jobid = NULL; qt->queue->state = Q_SEM_WAIT; ret = sem_init(&qt->queue->sem, 0, 0); |