X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=d95f95a2481ba860ae4ee0c304d3190cf09f53f9;hb=e9cca90a162e3e4b1db4a5e5188831beaa69d44e;hp=535830c0c43cc77cb42263f8af9f3e8164484251;hpb=bb990ccc49ee724a8af2ad80bde066374af4b68a;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 535830c0c..d95f95a24 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -39,13 +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,29 +53,31 @@ JobManager::JobManager ()
 void
 JobManager::start ()
 {
-	_scheduler = new boost::thread (boost::bind (&JobManager::scheduler, this));
+	_scheduler = boost::thread (boost::bind(&JobManager::scheduler, this));
 #ifdef DCPOMATIC_LINUX
-	pthread_setname_np (_scheduler->native_handle(), "job-scheduler");
+	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) {
-		/* Ideally this would be a DCPOMATIC_ASSERT(_scheduler->joinable()) but we
-		   can't throw exceptions from a destructor.
-		*/
-		if (_scheduler->joinable ()) {
-			_scheduler->join ();
+	if (_scheduler.joinable()) {
+		try {
+			_scheduler.join();
+		} catch (...) {
+
 		}
 	}
-
-	delete _scheduler;
 }
 
 shared_ptr<Job>
@@ -84,6 +86,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)));
@@ -99,6 +102,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)));
@@ -129,8 +133,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;
 		}
 	}
@@ -143,42 +147,54 @@ JobManager::scheduler ()
 {
 	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 *
@@ -213,7 +229,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;
 			}
@@ -228,6 +244,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)));