Cleanup: rename _empty_condition -> _schedule_condition

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index d8c0b02f2f210a58c863fe81d072dfecdd883468..5504251b00faa073a2be36747294400091e96209 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -30,6 +30,7 @@
 #include "film.h"
 #include "job.h"
 #include "job_manager.h"
+#include "util.h"
 #include <boost/thread.hpp>
 
 
@@ -74,7 +75,7 @@ JobManager::~JobManager ()
        {
                boost::mutex::scoped_lock lm (_mutex);
                _terminate = true;
-               _empty_condition.notify_all ();
+               _schedule_condition.notify_all();
        }
 
        try {
@@ -89,7 +90,7 @@ JobManager::add (shared_ptr<Job> j)
        {
                boost::mutex::scoped_lock lm (_mutex);
                _jobs.push_back (j);
-               _empty_condition.notify_all ();
+               _schedule_condition.notify_all();
        }
 
        emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(j)));
@@ -106,7 +107,7 @@ JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
                auto i = find (_jobs.begin(), _jobs.end(), after);
                DCPOMATIC_ASSERT (i != _jobs.end());
                _jobs.insert (i, j);
-               _empty_condition.notify_all ();
+               _schedule_condition.notify_all();
        }
 
        emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(j)));
@@ -159,39 +160,30 @@ JobManager::scheduler ()
 
                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;
                        }
                }
+
+               _schedule_condition.wait(lm);
        }
 }
 
@@ -205,7 +197,7 @@ JobManager::job_finished ()
                _last_active_job = optional<string>();
        }
 
-       _empty_condition.notify_all ();
+       _schedule_condition.notify_all();
 }
 
 
@@ -258,7 +250,7 @@ JobManager::analyse_audio (
                job = make_shared<AnalyseAudioJob> (film, playlist, from_zero);
                connection = job->Finished.connect (ready);
                _jobs.push_back (job);
-               _empty_condition.notify_all ();
+               _schedule_condition.notify_all ();
        }
 
        emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
@@ -293,7 +285,7 @@ JobManager::analyse_subtitles (
                job = make_shared<AnalyseSubtitlesJob>(film, content);
                connection = job->Finished.connect (ready);
                _jobs.push_back (job);
-               _empty_condition.notify_all ();
+               _schedule_condition.notify_all ();
        }
 
        emit (boost::bind(boost::ref(JobAdded), weak_ptr<Job>(job)));
@@ -303,75 +295,34 @@ JobManager::analyse_subtitles (
 void
 JobManager::increase_priority (shared_ptr<Job> job)
 {
-       bool changed = false;
-
        {
                boost::mutex::scoped_lock lm (_mutex);
-               auto last = _jobs.end ();
-               for (auto i = _jobs.begin(); i != _jobs.end(); ++i) {
-                       if (*i == job && last != _jobs.end()) {
-                               swap (*i, *last);
-                               changed = true;
-                               break;
-                       }
-                       last = i;
+               auto iter = std::find(_jobs.begin(), _jobs.end(), job);
+               if (iter == _jobs.begin() || iter == _jobs.end()) {
+                       return;
                }
+               swap(*iter, *std::prev(iter));
        }
 
-       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 ();
-                               }
-                       }
-               }
-       }
-
-       emit (boost::bind(boost::ref(JobsReordered)));
+       _schedule_condition.notify_all();
+       emit(boost::bind(boost::ref(JobsReordered)));
 }
 
 
 void
 JobManager::decrease_priority (shared_ptr<Job> job)
 {
-       bool changed = false;
-
        {
                boost::mutex::scoped_lock lm (_mutex);
-               for (auto i = _jobs.begin(); i != _jobs.end(); ++i) {
-                       auto next = i;
-                       ++next;
-                       if (*i == job && next != _jobs.end()) {
-                               swap (*i, *next);
-                               changed = true;
-                               break;
-                       }
+               auto iter = std::find(_jobs.begin(), _jobs.end(), job);
+               if (iter == _jobs.end() || std::next(iter) == _jobs.end()) {
+                       return;
                }
+               swap(*iter, *std::next(iter));
        }
 
-       if (changed) {
-               priority_changed ();
-       }
+       _schedule_condition.notify_all();
+       emit(boost::bind(boost::ref(JobsReordered)));
 }
 
 
@@ -380,7 +331,7 @@ JobManager::pause ()
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (_paused) {
+       if (_paused_job) {
                return;
        }
 
@@ -389,8 +340,6 @@ JobManager::pause ()
                        _paused_job = i;
                }
        }
-
-       _paused = true;
 }
 
 
@@ -398,14 +347,11 @@ void
 JobManager::resume ()
 {
        boost::mutex::scoped_lock lm (_mutex);
-       if (!_paused) {
-               return;
-       }
 
-       if (_paused_job) {
-               _paused_job->resume ();
+       if (!_paused_job) {
+               return;
        }
 
-       _paused_job.reset ();
-       _paused = false;
+       _paused_job->resume();
+       _paused_job.reset();
 }