interrupt long-running evaluations (#162)

ckrause · web-flow · commit 7c6ec1783bca · 2022-07-22T20:28:15.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,8 @@
         "map": "cpp",
         "chrono": "cpp",
         "utility": "cpp",
-        "stdexcept": "cpp"
+        "stdexcept": "cpp",
+        "thread": "cpp"
     },
     "makefile.makeDirectory": "src"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ To install or update LODA, please follow the [installation instructions](https:/
 
 ### Bugfixes
 
+* Interrupt long-running evaluations if time limit is reached
 * Fix handling of protected programs
 * Fix progress monitor for native mining (non-BOINC)
 
diff --git a/src/Makefile.linux-arm64.mk b/src/Makefile.linux-arm64.mk
@@ -1,6 +1,6 @@
 # BEGIN PLATFORM CONFIG FOR LINUX ARM64
 CXX = aarch64-linux-gnu-g++
-LDFLAGS = -static -static-libstdc++ -static-libgcc
+LDFLAGS = -pthread -static -static-libstdc++ -static-libgcc
 # END PLATFORM CONFIG FOR LINUX ARM64
 
 include Makefile
diff --git a/src/Makefile.linux-x86.mk b/src/Makefile.linux-x86.mk
@@ -1,6 +1,6 @@
 # BEGIN PLATFORM CONFIG FOR LINUX X86
 CXX = x86_64-linux-gnu-g++
-LDFLAGS = -static -static-libstdc++ -static-libgcc
+LDFLAGS = -pthread -static -static-libstdc++ -static-libgcc
 # END PLATFORM CONFIG FOR LINUX X86
 
 include Makefile
diff --git a/src/boinc.cpp b/src/boinc.cpp
@@ -79,8 +79,7 @@ void Boinc::run() {
   }
 
   // start mining!
-  Miner miner(settings, 60,  // reduced log interval: 1 minute
-              &progress_monitor);
+  Miner miner(settings, &progress_monitor);
   miner.mine();
 }
 
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -208,7 +208,7 @@ void Commands::mine() {
     const int64_t target_seconds = settings.num_mine_hours * 3600;
     progress_monitor.reset(new ProgressMonitor(target_seconds, "", "", 0));
   }
-  Miner miner(settings, Miner::DEFAULT_LOG_INTERVAL, progress_monitor.get());
+  Miner miner(settings, progress_monitor.get());
   miner.mine();
 }
 
diff --git a/src/finder.cpp b/src/finder.cpp
@@ -78,6 +78,7 @@ Matcher::seq_programs_t Finder::findSequence(
     evaluator.eval(p, tmp_seqs);
     norm_seq = tmp_seqs[1];
   } catch (const std::exception &) {
+    // evaluation error
     return result;
   }
   Program p2 = p;
diff --git a/src/include/miner.hpp b/src/include/miner.hpp
@@ -25,16 +25,15 @@ class Miner {
     std::vector<Matcher::Config> matchers;
   };
 
-  static constexpr int64_t DEFAULT_LOG_INTERVAL = 120;  // 2 minutes
-
-  Miner(const Settings &settings, int64_t log_interval = DEFAULT_LOG_INTERVAL,
-        ProgressMonitor *progress_monitor = nullptr);
+  Miner(const Settings &settings, ProgressMonitor *progress_monitor = nullptr);
 
   void mine();
 
   void submit(const std::string &path, std::string id);
 
  private:
+  void runMineLoop();
+
   bool checkRegularTasks();
 
   void reload();
diff --git a/src/include/util.hpp b/src/include/util.hpp
@@ -133,3 +133,8 @@ class Random {
  private:
   Random();
 };
+
+class Signals {
+ public:
+  static bool HALT;
+};
diff --git a/src/interpreter.cpp b/src/interpreter.cpp
@@ -240,6 +240,11 @@ size_t Interpreter::run(const Program& p, Memory& mem) {
           "Maximum memory exceeded: " + std::to_string(mem.approximate_size()) +
           "; last operation: " + ProgramUtil::operationToString(op));
     }
+
+    // check for external interrupt
+    if (Signals::HALT) {
+      throw std::runtime_error("interpreter interrupted by halt signal");
+    }
   }
   if (is_debug) {
     Log::get().debug("Finished execution after " + std::to_string(cycles) +
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -1,7 +1,9 @@
 #include "miner.hpp"
 
+#include <chrono>
 #include <fstream>
 #include <sstream>
+#include <thread>
 #include <unordered_set>
 
 #include "config.hpp"
@@ -18,12 +20,11 @@ const std::string Miner::ANONYMOUS("anonymous");
 const int64_t Miner::PROGRAMS_TO_FETCH = 2000;  // magic number
 const int64_t Miner::NUM_MUTATIONS = 100;       // magic number
 
-Miner::Miner(const Settings &settings, int64_t log_interval,
-             ProgressMonitor *progress_monitor)
+Miner::Miner(const Settings &settings, ProgressMonitor *progress_monitor)
     : settings(settings),
       mining_mode(Setup::getMiningMode()),
       validation_mode(ValidationMode::EXTENDED),  // set in reload()
-      log_scheduler(log_interval),
+      log_scheduler(36),                          // 1% steps (magic number)
       metrics_scheduler(Metrics::get().publish_interval),
       cpuhours_scheduler(3600),  // 1 hour (fixed!!)
       api_scheduler(300),        // 5 minutes (magic number)
@@ -53,24 +54,44 @@ void Miner::reload() {
 }
 
 void Miner::mine() {
+  if (progress_monitor) {
+    // start background thread for progress monitoring
+    auto monitor = progress_monitor;
+    auto delay = std::chrono::seconds(36);  // 1% steps (magic number)
+    std::thread thread([monitor, delay]() {
+      while (!monitor->isTargetReached()) {
+        monitor->writeProgress();
+        std::this_thread::sleep_for(delay);
+      }
+      Signals::HALT = true;
+    });
+
+    // run main mining loop
+    try {
+      runMineLoop();
+      auto mins = std::to_string(monitor->getElapsedSeconds() / 60);
+      Log::get().info("Finished mining after " + mins + " minutes");
+    } catch (const std::exception &e) {
+      Log::get().error("Mining error: " + std::string(e.what()));
+    }
+    thread.join();
+  } else {
+    // run mining loop w/o monitoring
+    runMineLoop();
+  }
+}
+
+void Miner::runMineLoop() {
   Parser parser;
   std::stack<Program> progs;
   Sequence norm_seq;
   Program program;
   Matcher::seq_programs_t seq_programs;
   update_program_result_t update_result;
 
-  // initial progress reporting
-  if (progress_monitor) {
-    progress_monitor->writeProgress();
-  }
-
   // load manager
   if (!manager) {
     reload();
-    if (progress_monitor) {
-      progress_monitor->writeProgress();
-    }
   }
 
   // validate modes
@@ -203,16 +224,12 @@ void Miner::mine() {
   while (num_reported_hours < settings.num_mine_hours) {
     reportCPUHour();
   }
-
-  // finish with log message
-  if (progress_monitor) {
-    int64_t mins = progress_monitor->getElapsedSeconds() / 60;
-    Log::get().info("Finished mining after " + std::to_string(mins) +
-                    " minutes");
-  }
 }
 
 bool Miner::checkRegularTasks() {
+  if (Signals::HALT) {
+    return false;  // stop immediately
+  }
   bool result = true;
 
   // regular task: log info
@@ -233,14 +250,6 @@ bool Miner::checkRegularTasks() {
     } else {
       Log::get().warn("Slow processing of programs" + progress);
     }
-
-    // regular task: report progress and check termination
-    if (progress_monitor) {
-      if (progress_monitor->isTargetReached()) {
-        result = false;
-      }
-      progress_monitor->writeProgress();
-    }
   }
 
   // regular task: fetch programs from API server
diff --git a/src/minimizer.cpp b/src/minimizer.cpp
@@ -16,6 +16,9 @@ bool Minimizer::minimize(Program& p, size_t num_terms) const {
   // calculate target sequence
   Sequence target_sequence;
   steps_t target_steps = evaluator.eval(p, target_sequence, num_terms, false);
+  if (Signals::HALT) {
+    return false;  // interrupted evaluation
+  }
   if (target_sequence.size() < settings.num_terms) {
     Log::get().error(
         "Cannot minimize program because there are too few terms: " +
diff --git a/src/oeis_manager.cpp b/src/oeis_manager.cpp
@@ -797,6 +797,9 @@ bool OeisManager::maintainProgram(size_t id) {
     // don't use incremental evaluation in maintenance to detect bugs
     auto check = evaluator.check(program, extended_seq,
                                  OeisSequence::DEFAULT_SEQ_LENGTH, id, false);
+    if (Signals::HALT) {
+      return true;  // interrupted evaluation
+    }
     is_okay = (check.first != status_t::ERROR);  // we allow warnings
   } catch (const std::exception &e) {
     Log::get().error(
diff --git a/src/util.cpp b/src/util.cpp
@@ -500,3 +500,5 @@ Random::Random() {
   seed = dev();
   gen.seed(seed);
 }
+
+bool Signals::HALT = false;

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,7 @@ void Boinc::run() {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// start mining!`
`82`		`- Miner miner(settings, 60, // reduced log interval: 1 minute`
`83`		`- &progress_monitor);`
	`82`	`+ Miner miner(settings, &progress_monitor);`
`84`	`83`	`miner.mine();`
`85`	`84`	`}`
`86`	`85`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ void Commands::mine() {`
`208`	`208`	`const int64_t target_seconds = settings.num_mine_hours * 3600;`
`209`	`209`	`progress_monitor.reset(new ProgressMonitor(target_seconds, "", "", 0));`
`210`	`210`	`}`
`211`		`- Miner miner(settings, Miner::DEFAULT_LOG_INTERVAL, progress_monitor.get());`
	`211`	`+ Miner miner(settings, progress_monitor.get());`
`212`	`212`	`miner.mine();`
`213`	`213`	`}`
`214`	`214`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ Matcher::seq_programs_t Finder::findSequence(`
`78`	`78`	`evaluator.eval(p, tmp_seqs);`
`79`	`79`	`norm_seq = tmp_seqs[1];`
`80`	`80`	`} catch (const std::exception &) {`
	`81`	`+ // evaluation error`
`81`	`82`	`return result;`
`82`	`83`	`}`
`83`	`84`	`Program p2 = p;`
Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,11 @@ size_t Interpreter::run(const Program& p, Memory& mem) {`
`240`	`240`	`"Maximum memory exceeded: " + std::to_string(mem.approximate_size()) +`
`241`	`241`	`"; last operation: " + ProgramUtil::operationToString(op));`
`242`	`242`	`}`
	`243`	`+`
	`244`	`+ // check for external interrupt`
	`245`	`+ if (Signals::HALT) {`
	`246`	`+ throw std::runtime_error("interpreter interrupted by halt signal");`
	`247`	`+ }`
`243`	`248`	`}`
`244`	`249`	`if (is_debug) {`
`245`	`250`	`Log::get().debug("Finished execution after " + std::to_string(cycles) +`