Changeset 3828 for trunk/yat/utility/Scheduler.cc

Timestamp:

Jul 23, 2019, 5:05:09 AM (4 years ago)

Author:

Peter

Message:

Make the Scheduler recyclable i.e. allow jobs to be submitted also after wait() or interrupt() has been called. closes #916

File:

• trunk/yat/utility/Scheduler.cc (modified) (3 diffs)

trunk/yat/utility/Scheduler.cc

@@ -53 +53 @@
   void Scheduler::interrupt(void)
   {
+    throw_if_error();
+    if (!job_handler_.joinable())
+      return;
+
     // first signal to JobHandler that Scheduler is waiting
     boost::shared_ptr<Job> end;
@@ -72 +76 @@
   {
     throw_if_error();
+    // if JobHandler is not joinable implies it is not executing,
+    // launch a new thread executing a JobHandler.
+    if (!job_handler_.joinable()) {
+      assert(data_.jobs().empty());
+      /*
+        We cannot relaunch a thread, so instead we create a new thread
+        and move its guts to our member variable, job_handler_.
+        In c++11 we could do:
+        job_handler_ = boost::thread(JobHandler(data_));
+        but in c++98 we instead use swap
+       */
+      JobHandler tmp_handler(data_);
+      boost::thread tmp(tmp_handler);
+      swap(tmp, job_handler_);
+    }
     data_.jobs().push(job);
   }
@@ -99 +118 @@
   void Scheduler::wait(void)
   {
+    throw_if_error();
+    if (!job_handler_.joinable())
+      return;
+
     // first signal to JobHandler that Scheduler is waiting
     boost::shared_ptr<Job> end;