flag for miner activity metric

Author: ckrause

CHANGELOG.md

@@ -9,7 +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
+* New metrics for counting program submissions and miner activity
 
 ### Enhancements
 

src/include/setup.hpp

@@ -36,7 +36,7 @@ class Setup {
 
   static std::string getSetupValue(const std::string& key);
 
-  static bool getSetupFlag(const std::string& key);
+  static bool getSetupFlag(const std::string& key, bool default_value);
 
   static int64_t getSetupInt(const std::string& key, int64_t default_value);
 

src/miner.cpp

@@ -171,7 +171,8 @@ void Miner::checkRegularTasks() {
   // regular task: report CPU hours
   if (cpuhours_scheduler.isTargetReached()) {
     cpuhours_scheduler.reset();
-    if (mining_mode != MINING_MODE_LOCAL) {
+    if (mining_mode != MINING_MODE_LOCAL &&
+        Setup::getSetupFlag("LODA_SUBMIT_CPU_HOURS", true)) {
       api_client->postCPUHour();
     }
   }

src/oeis_manager.cpp

@@ -659,6 +659,7 @@ size_t getBadOpsCount(const Program &p) {
   // - w/o indirect memory access
   // - w/o loops that have non-constant args
   // - w/o gcd with powers of a small constant
+  // - w/o bin (can be very slow)
   size_t num_ops = ProgramUtil::numOps(p, Operand::Type::INDIRECT);
   for (auto &op : p.ops) {
     if (op.type == Operation::Type::LPB &&
@@ -670,6 +671,9 @@ size_t getBadOpsCount(const Program &p) {
         Minimizer::getPowerOf(op.source.value) != 0) {
       num_ops++;
     }
+    if (op.type == Operation::Type::BIN) {
+      num_ops++;
+    }
   }
   return num_ops;
 }

src/setup.cpp

@@ -149,9 +149,12 @@ std::string Setup::getSetupValue(const std::string& key) {
   return std::string();
 }
 
-bool Setup::getSetupFlag(const std::string& key) {
+bool Setup::getSetupFlag(const std::string& key, bool default_value) {
   auto s = getSetupValue(key);
-  return (s == "yes" || s == "true");
+  if (s.empty()) {
+    return default_value;
+  }
+  return (s == "yes" || s == "true" || s == "1");
 }
 
 int64_t Setup::getSetupInt(const std::string& key, int64_t default_value) {

src/util.cpp

@@ -73,8 +73,8 @@ void Log::error(const std::string &msg, bool throw_) {
 void Log::alert(const std::string &msg, AlertDetails details) {
   log(Log::Level::ALERT, msg);
   if (!loaded_alerts_config) {
-    slack_alerts = Setup::getSetupFlag("LODA_SLACK_ALERTS");
-    tweet_alerts = Setup::getSetupFlag("LODA_TWEET_ALERTS");
+    slack_alerts = Setup::getSetupFlag("LODA_SLACK_ALERTS", false);
+    tweet_alerts = Setup::getSetupFlag("LODA_TWEET_ALERTS", false);
     loaded_alerts_config = true;
   }
   std::string copy = msg;