X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=26e2d28970a71c0f5a9d90b7582ed2738fd2fca0;hp=6d651d2ba1d51adc531efc64b51c6c5f88002d31;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=ab1c8a67afba072b1c29f0c3c34aa9779643e66a

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 6d651d2ba..26e2d2897 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -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)
 {
 
@@ -60,9 +62,14 @@ JobManager::start ()
 
 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) {
@@ -83,6 +90,7 @@ JobManager::add (shared_ptr<Job> j)
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_jobs.push_back (j);
+		_empty_condition.notify_all ();
 	}
 
 	emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j)));
@@ -98,6 +106,7 @@ JobManager::add_after (shared_ptr<Job> after, shared_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)));
@@ -128,8 +137,8 @@ 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 ()) {
+	BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+		if (i->finished_in_error ()) {
 			return true;
 		}
 	}
@@ -142,40 +151,54 @@ JobManager::scheduler ()
 {
 	while (true) {
 
-		optional<string> 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<Job> i, _jobs) {
-
-				if (!i->finished ()) {
-					active_job = i->json_name ();
+				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;
+					have_new = true;
 				}
 			}
+
+			if ((!have_running && have_new) || _terminate) {
+				break;
+			}
+
+			_empty_condition.wait (lm);
 		}
 
-		if (active_job != _last_active_job) {
-			emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
-			_last_active_job = active_job;
+		if (_terminate) {
+			break;
+		}
+
+		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 *
@@ -210,7 +233,7 @@ JobManager::analyse_audio (
 
 		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;
 			}
@@ -225,6 +248,7 @@ JobManager::analyse_audio (
 		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)));
@@ -284,13 +308,16 @@ JobManager::decrease_priority (shared_ptr<Job> job)
 {
 	bool changed = false;
 
- 	for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
-		list<shared_ptr<Job> >::iterator next = i;
-		++next;
-		if (*i == job && next != _jobs.end()) {
-			swap (*i, *next);
-			changed = true;
-			break;
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
+			list<shared_ptr<Job> >::iterator next = i;
+			++next;
+			if (*i == job && next != _jobs.end()) {
+				swap (*i, *next);
+				changed = true;
+				break;
+			}
 		}
 	}
 
@@ -298,3 +325,37 @@ JobManager::decrease_priority (shared_ptr<Job> job)
 		priority_changed ();
 	}
 }
+
+void
+JobManager::pause ()
+{
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if (_paused) {
+		return;
+	}
+
+	BOOST_FOREACH (shared_ptr<Job> 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;
+}