X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=1724879d0656ffe38b0a6962374a1489744af377;hp=63db662d0f185aed9502c342d5d7dd794a75f68b;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=05c37bfdb86be26497d5baa448a0cbda20e33bed diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index 63db662d0..1724879d0 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,39 +22,60 @@ * @brief A simple scheduler for jobs. */ -#include -#include #include "job_manager.h" #include "job.h" #include "cross.h" -#include "ui_signaller.h" +#include "analyse_audio_job.h" +#include "analyse_subtitles_job.h" +#include "film.h" +#include +#include using std::string; using std::list; using std::cout; -using boost::shared_ptr; -using boost::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; +using boost::function; +using std::dynamic_pointer_cast; +using boost::optional; +using boost::bind; JobManager* JobManager::_instance = 0; JobManager::JobManager () : _terminate (false) - , _last_active_jobs (false) - , _scheduler (new boost::thread (boost::bind (&JobManager::scheduler, this))) + , _paused (false) +{ + +} + +void +JobManager::start () { - + _scheduler = boost::thread (boost::bind(&JobManager::scheduler, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_scheduler.native_handle(), "job-scheduler"); +#endif } JobManager::~JobManager () { + boost::this_thread::disable_interruption dis; + + for (auto& i: _connections) { + i.disconnect (); + } + { boost::mutex::scoped_lock lm (_mutex); _terminate = true; + _empty_condition.notify_all (); } - if (_scheduler->joinable ()) { - _scheduler->join (); - } + try { + _scheduler.join(); + } catch (...) {} } shared_ptr @@ -62,10 +84,27 @@ JobManager::add (shared_ptr j) { boost::mutex::scoped_lock lm (_mutex); _jobs.push_back (j); + _empty_condition.notify_all (); } emit (boost::bind (boost::ref (JobAdded), weak_ptr (j))); - + + return j; +} + +shared_ptr +JobManager::add_after (shared_ptr after, shared_ptr j) +{ + { + boost::mutex::scoped_lock lm (_mutex); + list >::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 (j))); + return j; } @@ -92,55 +131,68 @@ bool JobManager::errors () const { boost::mutex::scoped_lock lm (_mutex); - for (list >::const_iterator i = _jobs.begin(); i != _jobs.end(); ++i) { - if ((*i)->finished_in_error ()) { + for (auto i: _jobs) { + if (i->finished_in_error ()) { return true; } } return false; -} +} void JobManager::scheduler () { while (true) { - bool active_jobs = false; - - { - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - return; - } - - for (list >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) { + boost::mutex::scoped_lock lm (_mutex); - if (!(*i)->finished ()) { - active_jobs = true; + while (true) { + bool have_new = false; + bool have_running = false; + for (auto i: _jobs) { + if (i->running()) { + have_running = true; } - - if ((*i)->running ()) { - /* Something is already happening */ - break; - } - - if ((*i)->is_new()) { - (*i)->start (); - - /* Only start one job at once */ - break; + if (i->is_new()) { + have_new = true; } } + + if ((!have_running && have_new) || _terminate) { + break; + } + + _empty_condition.wait (lm); } - if (active_jobs != _last_active_jobs) { - _last_active_jobs = active_jobs; - emit (boost::bind (boost::ref (ActiveJobsChanged), active_jobs)); + if (_terminate) { + break; } - dcpomatic_sleep (1); + for (auto 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; + } + } + } +} + +void +JobManager::job_finished () +{ + { + boost::mutex::scoped_lock lm (_mutex); + emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, optional())); + _last_active_job = optional(); } + + _empty_condition.notify_all (); } JobManager * @@ -148,6 +200,7 @@ JobManager::instance () { if (_instance == 0) { _instance = new JobManager (); + _instance->start (); } return _instance; @@ -159,3 +212,180 @@ JobManager::drop () delete _instance; _instance = 0; } + +void +JobManager::analyse_audio ( + shared_ptr film, + shared_ptr playlist, + bool from_zero, + boost::signals2::connection& connection, + function ready + ) +{ + { + boost::mutex::scoped_lock lm (_mutex); + + for (auto i: _jobs) { + shared_ptr a = dynamic_pointer_cast (i); + if (a && a->path() == film->audio_analysis_path(playlist) && !i->finished_cancelled()) { + i->when_finished (connection, ready); + return; + } + } + } + + shared_ptr job; + + { + boost::mutex::scoped_lock lm (_mutex); + + 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))); +} + + +void +JobManager::analyse_subtitles ( + shared_ptr film, + shared_ptr content, + boost::signals2::connection& connection, + function ready + ) +{ + { + boost::mutex::scoped_lock lm (_mutex); + + for (auto i: _jobs) { + shared_ptr a = dynamic_pointer_cast (i); + if (a && a->path() == film->subtitle_analysis_path(content)) { + i->when_finished (connection, ready); + return; + } + } + } + + shared_ptr job; + + { + boost::mutex::scoped_lock lm (_mutex); + + job.reset (new AnalyseSubtitlesJob(film, content)); + connection = job->Finished.connect (ready); + _jobs.push_back (job); + _empty_condition.notify_all (); + } + + emit (boost::bind (boost::ref (JobAdded), weak_ptr (job))); +} + + +void +JobManager::increase_priority (shared_ptr job) +{ + bool changed = false; + + { + boost::mutex::scoped_lock lm (_mutex); + list >::iterator last = _jobs.end (); + for (list >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) { + if (*i == job && last != _jobs.end()) { + swap (*i, *last); + changed = true; + break; + } + last = i; + } + } + + 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))); +} + +void +JobManager::decrease_priority (shared_ptr job) +{ + bool changed = false; + + { + boost::mutex::scoped_lock lm (_mutex); + for (list >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) { + list >::iterator next = i; + ++next; + if (*i == job && next != _jobs.end()) { + swap (*i, *next); + changed = true; + break; + } + } + } + + if (changed) { + priority_changed (); + } +} + +void +JobManager::pause () +{ + boost::mutex::scoped_lock lm (_mutex); + + if (_paused) { + return; + } + + for (auto i: _jobs) { + if (i->pause_by_user()) { + _paused_job = i; + } + } + + _paused = true; +} + +void +JobManager::resume () +{ + boost::mutex::scoped_lock lm (_mutex); + if (!_paused) { + return; + } + + if (_paused_job) { + _paused_job->resume (); + } + + _paused_job.reset (); + _paused = false; +}