Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 535830c0c43cc77cb42263f8af9f3e8164484251..26e2d28970a71c0f5a9d90b7582ed2738fd2fca0 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -39,6 +39,7 @@ using boost::weak_ptr;
 using boost::function;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::bind;
 
 JobManager* JobManager::_instance = 0;
 
@@ -61,9 +62,14 @@ JobManager::start ()
 
 JobManager::~JobManager ()
 {
+       BOOST_FOREACH (boost::signals2::connection& i, _connections) {
+               i.disconnect ();
+       }
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _terminate = true;
+               _empty_condition.notify_all ();
        }
 
        if (_scheduler) {
@@ -84,6 +90,7 @@ JobManager::add (shared_ptr<Job> j)
        {
                boost::mutex::scoped_lock lm (_mutex);
                _jobs.push_back (j);
+               _empty_condition.notify_all ();
        }
 
        emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
@@ -99,6 +106,7 @@ JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
                list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after);
                DCPOMATIC_ASSERT (i != _jobs.end());
                _jobs.insert (i, j);
+               _empty_condition.notify_all ();
        }
 
        emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
@@ -129,8 +137,8 @@ bool
 JobManager::errors () const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       for (list<shared_ptr<Job> >::const_iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
-               if ((*i)->finished_in_error ()) {
+       BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+               if (i->finished_in_error ()) {
                        return true;
                }
        }
@@ -143,42 +151,54 @@ JobManager::scheduler ()
 {
        while (true) {
 
-               optional<string> active_job;
+               boost::mutex::scoped_lock lm (_mutex);
 
-               {
-                       boost::mutex::scoped_lock lm (_mutex);
-                       if (_terminate) {
-                               return;
+               while (true) {
+                       bool have_new = false;
+                       bool have_running = false;
+                       BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+                               if (i->running()) {
+                                       have_running = true;
+                               }
+                               if (i->is_new()) {
+                                       have_new = true;
+                               }
                        }
 
-                       if (!_paused) {
-                               BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
-
-                                       if (!i->finished ()) {
-                                               active_job = i->json_name ();
-                                       }
+                       if ((!have_running && have_new) || _terminate) {
+                               break;
+                       }
 
-                                       if (i->running ()) {
-                                               /* Something is already happening */
-                                               break;
-                                       }
+                       _empty_condition.wait (lm);
+               }
 
-                                       if (i->is_new()) {
-                                               i->start ();
-                                               /* Only start one job at once */
-                                               break;
-                                       }
-                               }
-                       }
+               if (_terminate) {
+                       break;
                }
 
-               if (active_job != _last_active_job) {
-                       emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
-                       _last_active_job = active_job;
+               BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+                       if (i->is_new()) {
+                               _connections.push_back (i->FinishedImmediate.connect(bind(&JobManager::job_finished, this)));
+                               i->start ();
+                               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;
+                       }
                }
+       }
+}
 
-               dcpomatic_sleep (1);
+void
+JobManager::job_finished ()
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, optional<string>()));
+               _last_active_job = optional<string>();
        }
+
+       _empty_condition.notify_all ();
 }
 
 JobManager *
@@ -213,7 +233,7 @@ JobManager::analyse_audio (
 
                BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
                        shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
-                       if (a && a->playlist () == playlist) {
+                       if (a && a->path() == film->audio_analysis_path(playlist)) {
                                i->when_finished (connection, ready);
                                return;
                        }
@@ -228,6 +248,7 @@ JobManager::analyse_audio (
                job.reset (new AnalyseAudioJob (film, playlist, from_zero));
                connection = job->Finished.connect (ready);
                _jobs.push_back (job);
+               _empty_condition.notify_all ();
        }
 
        emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));