X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=26e2d28970a71c0f5a9d90b7582ed2738fd2fca0;hb=895b386b6751afd3d068155f4ea71e762297672a;hp=c9924d226426c0da60d358d9b362fcd6f4d356f4;hpb=8862cbbb7e857c90d405069ad7d41a8d58029194;p=dcpomatic.git diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index c9924d226..26e2d2897 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -39,11 +39,13 @@ using boost::weak_ptr; using boost::function; using boost::dynamic_pointer_cast; using boost::optional; +using boost::bind; JobManager* JobManager::_instance = 0; JobManager::JobManager () : _terminate (false) + , _paused (false) , _scheduler (0) { @@ -53,13 +55,21 @@ void JobManager::start () { _scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this)); +#ifdef DCPOMATIC_LINUX + pthread_setname_np (_scheduler->native_handle(), "job-scheduler"); +#endif } 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) { @@ -80,6 +90,23 @@ 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))); @@ -110,8 +137,8 @@ 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 ()) { + BOOST_FOREACH (shared_ptr i, _jobs) { + if (i->finished_in_error ()) { return true; } } @@ -124,40 +151,54 @@ JobManager::scheduler () { while (true) { - optional active_job; - - { - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - return; - } + boost::mutex::scoped_lock lm (_mutex); + while (true) { + bool have_new = false; + bool have_running = false; BOOST_FOREACH (shared_ptr i, _jobs) { - - if (!i->finished ()) { - active_job = i->json_name (); - } - - if (i->running ()) { - /* Something is already happening */ - break; + if (i->running()) { + have_running = true; } - if (i->is_new()) { - i->start (); - /* Only start one job at once */ - break; + have_new = true; } } + + if ((!have_running && have_new) || _terminate) { + break; + } + + _empty_condition.wait (lm); + } + + 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 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())); + _last_active_job = optional(); } + + _empty_condition.notify_all (); } JobManager * @@ -182,6 +223,7 @@ void JobManager::analyse_audio ( shared_ptr film, shared_ptr playlist, + bool from_zero, boost::signals2::connection& connection, function ready ) @@ -191,7 +233,7 @@ JobManager::analyse_audio ( BOOST_FOREACH (shared_ptr i, _jobs) { shared_ptr a = dynamic_pointer_cast (i); - if (a && a->playlist () == playlist) { + if (a && a->path() == film->audio_analysis_path(playlist)) { i->when_finished (connection, ready); return; } @@ -203,10 +245,117 @@ JobManager::analyse_audio ( { boost::mutex::scoped_lock lm (_mutex); - job.reset (new AnalyseAudioJob (film, playlist)); + 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::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; + BOOST_FOREACH (shared_ptr 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; + } + + BOOST_FOREACH (shared_ptr 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; +}