From 85d252f43c418c74f1f8b4baca0b4645af356f2f Mon Sep 17 00:00:00 2001
From: Ian Roddis <tech@kinesin.ca>
Date: Tue, 21 Dec 2021 17:23:58 -0400
Subject: [PATCH] Small bug fixes

---
 daggyr/daggyr/daggyr.cpp                                | 6 ++++--
 daggyr/libdaggyr/src/Server.cpp                         | 9 +++++----
 libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp | 6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/daggyr/daggyr/daggyr.cpp b/daggyr/daggyr/daggyr.cpp
index 52fddee..3770d21 100644
--- a/daggyr/daggyr/daggyr.cpp
+++ b/daggyr/daggyr/daggyr.cpp
@@ -118,6 +118,8 @@ int main(int argc, char **argv)
       .implicit_value(true);
   args.add_argument("-d", "--daemon").default_value(false).implicit_value(true);
   args.add_argument("--config").default_value(std::string{});
+  args.add_argument("--ip").default_value(std::string{"127.0.0.1"});
+  args.add_argument("--port").default_value(int{2504});
 
   try {
     args.parse_args(argc, argv);
@@ -135,8 +137,8 @@ int main(int argc, char **argv)
   bool verbose         = args.get<bool>("--verbose");
   bool asDaemon        = args.get<bool>("--daemon");
   auto configFile      = args.get<std::string>("--config");
-  std::string listenIP = "127.0.0.1";
-  int listenPort       = 2504;
+  std::string listenIP = args.get<std::string>("--ip");
+  int listenPort       = args.get<int>("--port");
   size_t webThreads    = 50;
   ssize_t maxCores     = std::max(1U, std::thread::hardware_concurrency() - 2);
   ssize_t maxMemoryMB =
diff --git a/daggyr/libdaggyr/src/Server.cpp b/daggyr/libdaggyr/src/Server.cpp
index 4432b5e..6f9f72e 100644
--- a/daggyr/libdaggyr/src/Server.cpp
+++ b/daggyr/libdaggyr/src/Server.cpp
@@ -196,13 +196,14 @@ namespace daggy::daggyr {
             curCapacity_.cores += it->second.resourcesUsed.cores;
             curCapacity_.memoryMB += it->second.resourcesUsed.memoryMB;
           }
+          pending_.extract(it);
           std::cout << "Resolved " << it->first.first << " / "
                     << it->first.second << std::endl;
         }
-      }
-      else {
-        payload = R"({ "state": "RUNNING" })";
-        found   = true;
+        else {
+          payload = R"({ "state": "RUNNING" })";
+          found   = true;
+        }
       }
     }
 
diff --git a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
index ee0ae4a..fb2d9f8 100644
--- a/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
+++ b/libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
@@ -146,9 +146,8 @@ std::future<AttemptRecord> DaggyRunnerTaskExecutor::execute(
       auto curCap = capacityFromJSON(doc["current"]);
       auto totCap = capacityFromJSON(doc["total"]);
 
-      ssize_t cores = curCap.cores < 0 ? totCap.cores : curCap.cores;
-      ssize_t memoryMB =
-          curCap.memoryMB < 0 ? totCap.memoryMB : curCap.memoryMB;
+      double cores    = curCap.cores < 0 ? totCap.cores : curCap.cores;
+      double memoryMB = curCap.memoryMB < 0 ? totCap.memoryMB : curCap.memoryMB;
 
       double impact =
           std::max(taskUsed.cores / cores, taskUsed.memoryMB / memoryMB);
@@ -170,6 +169,7 @@ std::future<AttemptRecord> DaggyRunnerTaskExecutor::execute(
 
   auto cit = impacts.begin();
   for (auto it = impacts.begin(); it != impacts.end(); ++it) {
+    std::cout << it->first << " impact is " << it->second << std::endl;
     if (it->second < cit->second)
       cit = it;
   }