From 800383146af49b4adfd6ecb6d32c6eef4cb27763 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 26 Oct 2021 21:31:18 +0200 Subject: runner: pass jobserver to task handler as reference Some code simplification. --- crates/runner/src/task.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/runner/src/task.rs') diff --git a/crates/runner/src/task.rs b/crates/runner/src/task.rs index ff27399..6c52be2 100644 --- a/crates/runner/src/task.rs +++ b/crates/runner/src/task.rs @@ -237,7 +237,7 @@ fn collect_outputs(input_hash: &InputHash, task: &Task) -> Result Result<()> { +fn run_task(input_hash: &InputHash, task: &Task, jobserver: &mut Jobserver) -> Result<()> { let _workdir_mount = init_task(input_hash, task).context("Failed to initialize task")?; unpack_dependencies(input_hash, task).context("Failed to unpack dependencies")?; let _rootfs_mount = init_task_rootfs(input_hash).context("Failed to initialize task rootfs")?; @@ -392,7 +392,7 @@ fn move_layer(input_hash: &InputHash, hash: &Option) -> Result<()> { fn run_and_hash_task( input_hash: &InputHash, task: &Task, - jobserver: Jobserver, + jobserver: &mut Jobserver, ) -> Result { run_task(input_hash, task, jobserver)?; @@ -430,7 +430,7 @@ fn save_cached(input_hash: &InputHash, output: &TaskOutput) -> Result<()> { Ok(()) } -pub fn handle(task: Task, jobserver: Jobserver) -> Result { +pub fn handle(task: Task, jobserver: &mut Jobserver) -> Result { let input_hash = input_hash(&task); // TODO: We should not hold a job token while waiting on the lock -- cgit v1.2.3