Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 93fdbd27a8d43472a1a93b64aad2a05b4a978c67..86e010c106b929d0cb6869026eda4a70baab86e5 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,35 +21,71 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <iostream>
-#include <boost/thread.hpp>
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
+#include "analyse_audio_job.h"
+#include "film.h"
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::cout;
+using boost::shared_ptr;
+using boost::weak_ptr;
+using boost::function;
+using boost::dynamic_pointer_cast;
+using boost::optional;
 
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
+       : _terminate (false)
+       , _scheduler (0)
 {
-       boost::thread (boost::bind (&JobManager::scheduler, this));
+
 }
 
 void
+JobManager::start ()
+{
+       _scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this));
+}
+
+JobManager::~JobManager ()
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _terminate = true;
+       }
+
+       if (_scheduler) {
+               DCPOMATIC_ASSERT (_scheduler->joinable ());
+               _scheduler->join ();
+       }
+
+       delete _scheduler;
+}
+
+shared_ptr<Job>
 JobManager::add (shared_ptr<Job> j)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       
-       _jobs.push_back (j);
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+               _jobs.push_back (j);
+       }
+
+       emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+
+       return j;
 }
 
 list<shared_ptr<Job> >
 JobManager::get () const
 {
        boost::mutex::scoped_lock lm (_mutex);
-       
        return _jobs;
 }
 
@@ -65,29 +101,57 @@ JobManager::work_to_do () const
        return i != _jobs.end ();
 }
 
+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 ()) {
+                       return true;
+               }
+       }
+
+       return false;
+}
+
 void
 JobManager::scheduler ()
 {
-       while (1) {
+       while (true) {
+
+               optional<string> active_job;
+
                {
                        boost::mutex::scoped_lock lm (_mutex);
-                       int running = 0;
-                       shared_ptr<Job> first_new;
-                       for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
-                               if ((*i)->running ()) {
-                                       ++running;
-                               } else if (!(*i)->finished () && first_new == 0) {
-                                       first_new = *i;
+                       if (_terminate) {
+                               return;
+                       }
+
+                       BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+
+                               if (!i->finished ()) {
+                                       active_job = i->json_name ();
                                }
 
-                               if (running == 0 && first_new) {
-                                       first_new->start ();
+                               if (i->running ()) {
+                                       /* Something is already happening */
+                                       break;
+                               }
+
+                               if (i->is_new()) {
+                                       i->start ();
+                                       /* Only start one job at once */
                                        break;
                                }
                        }
                }
 
-               dvdomatic_sleep (1);
+               if (active_job != _last_active_job) {
+                       emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
+                       _last_active_job = active_job;
+               }
+
+               dcpomatic_sleep (1);
        }
 }
 
@@ -96,7 +160,48 @@ JobManager::instance ()
 {
        if (_instance == 0) {
                _instance = new JobManager ();
+               _instance->start ();
        }
 
        return _instance;
 }
+
+void
+JobManager::drop ()
+{
+       delete _instance;
+       _instance = 0;
+}
+
+void
+JobManager::analyse_audio (
+       shared_ptr<const Film> film,
+       shared_ptr<const Playlist> playlist,
+       boost::signals2::connection& connection,
+       function<void()> ready
+       )
+{
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+
+               BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+                       shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
+                       if (a && a->playlist () == playlist) {
+                               i->when_finished (connection, ready);
+                               return;
+                       }
+               }
+       }
+
+       shared_ptr<AnalyseAudioJob> job;
+
+       {
+               boost::mutex::scoped_lock lm (_mutex);
+
+               job.reset (new AnalyseAudioJob (film, playlist));
+               connection = job->Finished.connect (ready);
+               _jobs.push_back (job);
+       }
+
+       emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (job)));
+}