using boost::function;
using boost::dynamic_pointer_cast;
using boost::optional;
+using boost::bind;
JobManager* JobManager::_instance = 0;
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) {
{
boost::mutex::scoped_lock lm (_mutex);
_jobs.push_back (j);
+ _empty_condition.notify_all ();
}
emit (boost::bind (boost::ref (JobAdded), weak_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)));
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;
}
}
{
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 *
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;
}
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)));