Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index f962754677c2c1c672092838a0eca23f73e5873f..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,41 +21,65 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <iostream>
-#include <boost/thread.hpp>
 #include "job_manager.h"
 #include "job.h"
 #include "cross.h"
-#include "ui_signaller.h"
+#include "analyse_audio_job.h"
+#include "film.h"
+#include <boost/thread.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 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 ()
-       : _last_active_jobs (false)
+       : _terminate (false)
+       , _scheduler (0)
 {
-       boost::thread (boost::bind (&JobManager::scheduler, this));
+
 }
 
-shared_ptr<Job>
-JobManager::add (shared_ptr<Job> j)
+void
+JobManager::start ()
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       _jobs.push_back (j);
-       return j;
+       _scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this));
 }
 
-void
-JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
+JobManager::~JobManager ()
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after);
-       assert (i != _jobs.end ());
-       ++i;
-       _jobs.insert (i, j);
+       {
+               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);
+       }
+
+       emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
+
+       return j;
 }
 
 list<shared_ptr<Job> >
@@ -88,42 +112,43 @@ JobManager::errors () const
        }
 
        return false;
-}      
+}
 
 void
 JobManager::scheduler ()
 {
-       while (1) {
+       while (true) {
 
-               bool active_jobs = false;
+               optional<string> active_job;
 
                {
                        boost::mutex::scoped_lock lm (_mutex);
-                       for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
+                       if (_terminate) {
+                               return;
+                       }
 
-                               if (!(*i)->finished ()) {
-                                       active_jobs = true;
+                       BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+
+                               if (!i->finished ()) {
+                                       active_job = i->json_name ();
                                }
-                               
-                               if ((*i)->running ()) {
+
+                               if (i->running ()) {
                                        /* Something is already happening */
                                        break;
                                }
-                               
-                               if ((*i)->is_new()) {
-                                       (*i)->start ();
-                                       
+
+                               if (i->is_new()) {
+                                       i->start ();
                                        /* Only start one job at once */
                                        break;
                                }
                        }
                }
 
-               if (active_jobs != _last_active_jobs) {
-                       _last_active_jobs = active_jobs;
-                       if (ui_signaller) {
-                               ui_signaller->emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs));
-                       }
+               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);
@@ -135,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)));
+}