Changeset 3828

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

Location:

trunk

Files:

• test/Makefile.am (modified) (1 diff)
• test/scheduler6.cc (modified) (1 diff)
• yat/utility/Scheduler.cc (modified) (3 diffs)
• yat/utility/Scheduler.h (modified) (1 diff)

trunk/test/Makefile.am

@@ -124 +124 @@
 
 # tests not passing through yet
-XFAIL_TESTS = test/scheduler6.test
+XFAIL_TESTS =
 
 DISTRIBUTED_TESTS = \

trunk/test/scheduler6.cc

@@ -74 +74 @@
   }
 
+  // just to test
+  scheduler.interrupt();
 
   return suite.return_value();

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;

trunk/yat/utility/Scheduler.h

@@ -75 +75 @@
      be accomplished by calling wait() or interrupt().
 
-     \note Currently, the Scheduler cannot be recycled, i.e.,
-     if wait(void) or interruped(void) have been called, the behaviour of
-     submit() is undefined.
+     \note Prior version 0.17 the Scheduler could not be recycled, i.e.,
+     if wait(void) or interruped(void) had been called, the behaviour of
+     submit() was undefined.
 
      \since New in yat 0.13