From f08b17317c7d90f9e04836ea8cb0becd678218ab Mon Sep 17 00:00:00 2001 From: Ian Roddis Date: Fri, 11 Feb 2022 13:09:01 -0400 Subject: [PATCH] Simplifying code --- libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp index 94aa005..a494e24 100644 --- a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp +++ b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp @@ -152,7 +152,6 @@ TaskFuture DaggyRunnerTaskExecutor::execute(DAGRunID runID, auto taskUsed = capacityFromTask(task); std::string exe_runner; - Capacity *exe_capacity; // Block until a host is found std::unique_lock lock(runnersGuard_); @@ -161,16 +160,16 @@ TaskFuture DaggyRunnerTaskExecutor::execute(DAGRunID runID, for (auto &[runner, capacity] : runners_) { if (capacity.cores >= taskUsed.cores and capacity.memoryMB >= taskUsed.memoryMB) { - exe_runner = runner; - exe_capacity = &capacity; + exe_runner = runner; + capacity.cores -= taskUsed.cores; + capacity.memoryMB -= taskUsed.memoryMB; return true; } } return false; }); - exe_capacity->cores -= taskUsed.cores; - exe_capacity->memoryMB -= taskUsed.memoryMB; + // Capacity has already been reduced lock.unlock(); std::stringstream ss;