cpuhours metric

Author: ckrause

CHANGELOG.md

@@ -9,6 +9,7 @@ To install or update LODA, please follow the [installation instructions](https:/
 ### Features
 
 * Built-in parallel mining command: `loda mine -p` (replaces `mine_parallel.sh` script)
+* New metrics on program submissions and CPU hours
 
 ### Enhancements
 

src/api_client.cpp

@@ -56,6 +56,13 @@ bool ApiClient::postProgram(const std::string& path, bool fail_on_error) {
   return true;
 }
 
+void ApiClient::postCPUHour() {
+  const std::string url = BASE_URL + "cpuhours";
+  if (!WebClient::postFile(url, {})) {
+    Log::get().warn("Error reporting CPU hour");
+  }
+}
+
 bool ApiClient::getProgram(int64_t index, const std::string& path) {
   std::remove(path.c_str());
   return WebClient::get(BASE_URL + "programs/" + std::to_string(index), path,

src/include/api_client.hpp

@@ -12,6 +12,8 @@ class ApiClient {
 
   bool postProgram(const std::string& path, bool fail_on_error = true);
 
+  void postCPUHour();
+
   Program getNextProgram();
 
  private:

src/include/miner.hpp

@@ -49,6 +49,7 @@ class Miner {
   std::unique_ptr<Mutator> mutator;
   AdaptiveScheduler log_scheduler;
   AdaptiveScheduler metrics_scheduler;
+  AdaptiveScheduler cpuhours_scheduler;
   AdaptiveScheduler api_scheduler;
   AdaptiveScheduler reload_scheduler;
   int64_t num_processed;

src/miner.cpp

@@ -22,8 +22,9 @@ Miner::Miner(const Settings &settings)
       mining_mode(Setup::getMiningMode()),
       log_scheduler(120),  // 2 minutes (magic number)
       metrics_scheduler(Metrics::get().publish_interval),
-      api_scheduler(600),       // 10 minutes (magic number)
-      reload_scheduler(21600),  // 6 hours (magic number)
+      api_scheduler(600),        // 10 minutes (magic number)
+      cpuhours_scheduler(3600),  // 1 hour (fixed!!)
+      reload_scheduler(21600),   // 6 hours (magic number)
       num_processed(0),
       num_new(0),
       num_updated(0),
@@ -167,6 +168,12 @@ void Miner::checkRegularTasks() {
     num_removed = 0;
   }
 
+  // regular task: report CPU hours
+  if (cpuhours_scheduler.isTargetReached()) {
+    cpuhours_scheduler.reset();
+    api_client->postCPUHour();
+  }
+
   // regular task: reload oeis manager and generators
   if (reload_scheduler.isTargetReached()) {
     reload_scheduler.reset();

src/web_client.cpp

@@ -61,7 +61,12 @@ bool WebClient::postFile(const std::string &url, const std::string &file_path,
       if (!auth.empty()) {
         cmd += " -u " + auth;
       }
-      cmd += " --data-binary \"@" + file_path + "\" " + url;
+      if (file_path.empty()) {
+        cmd += " -X POST";
+      } else {
+        cmd += " --data-binary \"@" + file_path + "\"";
+      }
+      cmd += " " + url;
       break;
     }
     case WC_WGET: {