Changeset 3405

Timestamp:

Apr 7, 2015, 1:17:10 AM (8 years ago)

Author:

Peter

Message:

fixes #832

Location:

trunk

Files:

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

trunk/test/Makefile.am

@@ -83 +83 @@
   test/scheduler.test \
   test/scheduler2.test \
+  test/scheduler3.test \
   test/segment.test test/smart_ptr.test \
   test/smith_waterman.test \

trunk/yat/utility/Scheduler.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2014 Peter Johansson
+  Copyright (C) 2014, 2015 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -24 +24 @@
 #include "Scheduler.h"
 
+#include <boost/exception.hpp>
+
 #include <cassert>
 
@@ -50 +52 @@
 
 
+  void Scheduler::interrupt(void)
+  {
+    workers_.interrupt_all();
+  }
+
+
   void Scheduler::post_process(JobPtr job)
   {
@@ -55 +63 @@
     assert(running_jobs_>=0);
     job->status_ = Job::completed;
+
+    // check if an error occurred
+    if (job->error_) {
+      interrupt();
+      boost::rethrow_exception(job->error_);
+    }
+
     // for convenience
     const std::vector<JobPtr>& vec = job->observers_;
@@ -182 +197 @@
       }
       // action
-      (*job)();
+      try {
+        (*job)();
+      }
+      catch (...) {
+        job->error_ = boost::current_exception();
+        // return job to scheduler so it can act on the error
+        completed_.push(job);
+        // exit work and go home
+        return;
+      }
       // return job to scheduler
       completed_.push(job);

trunk/yat/utility/Scheduler.h

@@ -26 +26 @@
 #include "Queue.h"
 
+#include <boost/exception_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
@@ -110 +111 @@
       unsigned priority_;
       unsigned id_;
+      boost::exception_ptr error_;
     }; // end class Job
 
@@ -127 +129 @@
     void add_dependency(boost::shared_ptr<Job> job,
                         boost::shared_ptr<Job> prerequisite);
+    /**
+       \brief interrrupt all jobs
+     */
+    void interrupt(void);
 
     /**