Simplify and fix job scheduler, especially with respect to the priority system.

[dcpomatic.git] / src / lib / job_manager.cc

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 2839bce30c379f8c98c85cffe5af54e0bd36cb50..608df7ef0af9063729824f7c3967d6d76b7a02fe 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -34,13 +34,13 @@
 
 
 using std::dynamic_pointer_cast;
+using std::function;
 using std::list;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
 using boost::bind;
-using boost::function;
 using boost::optional;
 
 
@@ -153,43 +153,36 @@ JobManager::errors () const
 void
 JobManager::scheduler ()
 {
+       start_of_thread ("JobManager");
+
        while (true) {
 
                boost::mutex::scoped_lock lm (_mutex);
 
-               while (true) {
-                       bool have_new = false;
-                       bool have_running = false;
-                       for (auto i: _jobs) {
-                               if (i->running()) {
-                                       have_running = true;
-                               }
-                               if (i->is_new()) {
-                                       have_new = true;
-                               }
-                       }
-
-                       if ((!have_running && have_new) || _terminate) {
-                               break;
-                       }
-
-                       _empty_condition.wait (lm);
-               }
-
                if (_terminate) {
                        break;
                }
 
+               bool have_running = false;
                for (auto i: _jobs) {
-                       if (i->is_new()) {
-                               _connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
-                               i->start ();
+                       if (have_running && i->running()) {
+                               i->pause_by_priority();
+                       } else if (!have_running && (i->is_new() || i->paused_by_priority())) {
+                               if (i->is_new()) {
+                                       _connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
+                                       i->start ();
+                               } else {
+                                       i->resume ();
+                               }
                                emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, i->json_name()));
                                _last_active_job = i->json_name ();
-                               /* Only start one job at once */
-                               break;
+                               have_running = true;
+                       } else if (!have_running && i->running()) {
+                               have_running = true;
                        }
                }
+
+               _empty_condition.wait (lm);
        }
 }
 
@@ -317,35 +310,9 @@ JobManager::increase_priority (shared_ptr<Job> job)
        }
 
        if (changed) {
-               priority_changed ();
-       }
-}
-
-
-void
-JobManager::priority_changed ()
-{
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-
-               bool first = true;
-               for (auto i: _jobs) {
-                       if (first) {
-                               if (i->is_new ()) {
-                                       i->start ();
-                               } else if (i->paused_by_priority ()) {
-                                       i->resume ();
-                               }
-                               first = false;
-                       } else {
-                               if (i->running ()) {
-                                       i->pause_by_priority ();
-                               }
-                       }
-               }
+               _empty_condition.notify_all ();
+               emit (boost::bind(boost::ref(JobsReordered)));
        }
-
-       emit (boost::bind(boost::ref(JobsReordered)));
 }
 
 
@@ -368,7 +335,8 @@ JobManager::decrease_priority (shared_ptr<Job> job)
        }
 
        if (changed) {
-               priority_changed ();
+               _empty_condition.notify_all ();
+               emit (boost::bind(boost::ref(JobsReordered)));
        }
 }