Speed up content discovery:

1. add all discovery jobs immediately rather than waiting for
   each one to finish (by polling) before starting the next.
2. replace polling with a condition in JobManager.

6 files changed, 79 insertions, 36 deletions

diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index 0f4da2457..424963726 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -32,6 +32,10 @@ public:
 	std::string json_name () const;
 	void run ();
 
+	boost::shared_ptr<Content> content () const {
+		return _content;
+	}
+
 private:
 	boost::shared_ptr<Content> _content;
 };
diff --git a/src/lib/job.cc b/src/lib/job.cc
index dde8cce62..763005b57 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -288,6 +288,7 @@ Job::set_state (State s)
 
 	if (finished) {
 		emit (boost::bind (boost::ref (Finished)));
+		FinishedImmediate ();
 	}
 }
 
diff --git a/src/lib/job.h b/src/lib/job.h
index 4fc61cb26..0e57021e0 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -89,6 +89,8 @@ public:
 	boost::signals2::signal<void()> Progress;
 	/** Emitted from the UI thread when the job is finished */
 	boost::signals2::signal<void()> Finished;
+	/** Emitted from the job thread when the job is finished */
+	boost::signals2::signal<void()> FinishedImmediate;
 
 protected:
 
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 535830c0c..d29138e9f 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -39,6 +39,7 @@ using boost::weak_ptr;
 using boost::function;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using boost::bind;
 
 JobManager* JobManager::_instance = 0;
 
@@ -61,6 +62,10 @@ JobManager::start ()
 
 JobManager::~JobManager ()
 {
+	BOOST_FOREACH (boost::signals2::connection& i, _connections) {
+		i.disconnect ();
+	}
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 		_terminate = true;
@@ -84,6 +89,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 +105,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)));
@@ -143,44 +150,58 @@ JobManager::scheduler ()
 {
 	while (true) {
 
+		boost::mutex::scoped_lock lm (_mutex);
+
 		optional<string> active_job;
 
-		{
-			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;
+					active_job = i->json_name();
+				}
+				if (i->is_new()) {
+					have_new = true;
+				}
 			}
 
-			if (!_paused) {
-				BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
+			if ((!have_running && have_new) || _terminate) {
+				break;
+			}
 
-					if (!i->finished ()) {
-						active_job = i->json_name ();
-					}
+			_empty_condition.wait (lm);
+		}
 
-					if (i->running ()) {
-						/* Something is already happening */
-						break;
-					}
+		if (_terminate) {
+			break;
+		}
 
-					if (i->is_new()) {
-						i->start ();
-						/* Only start one job at once */
-						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 ();
+				/* Only start one job at once */
+				break;
 			}
 		}
 
+		lm.unlock ();
+
 		if (active_job != _last_active_job) {
 			emit (boost::bind (boost::ref (ActiveJobsChanged), _last_active_job, active_job));
 			_last_active_job = active_job;
 		}
-
-		dcpomatic_sleep (1);
 	}
 }
 
+void
+JobManager::job_finished ()
+{
+	_empty_condition.notify_all ();
+}
+
 JobManager *
 JobManager::instance ()
 {
diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index aafb7aa67..e0b72994d 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -26,6 +26,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
 #include <list>
 
 class Job;
@@ -78,10 +79,13 @@ private:
 	void scheduler ();
 	void start ();
 	void priority_changed ();
+	void job_finished ();
 
 	mutable boost::mutex _mutex;
+	boost::condition _empty_condition;
 	/** List of jobs in the order that they will be executed */
 	std::list<boost::shared_ptr<Job> > _jobs;
+	std::list<boost::signals2::connection> _connections;
 	bool _terminate;
 	bool _paused;
 	boost::shared_ptr<Job> _paused_job;
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index e1503e790..b7f05020b 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -34,6 +34,7 @@
 
 using std::string;
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
@@ -82,6 +83,8 @@ ContentView::update ()
 	wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory"));
 	JobManager* jm = JobManager::instance ();
 
+	list<shared_ptr<ExamineContentJob> > jobs;
+
 	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
 		try {
 			shared_ptr<Content> content;
@@ -92,21 +95,9 @@ ContentView::update ()
 			}
 
 			if (content) {
-				jm->add (shared_ptr<Job>(new ExamineContentJob(film, content)));
-				while (jm->work_to_do()) {
-					if (!progress.Pulse()) {
-						/* user pressed cancel */
-						BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
-							i->cancel();
-						}
-						return;
-					}
-					dcpomatic_sleep (1);
-				}
-				if (report_errors_from_last_job (this)) {
-					add (content);
-					_content.push_back (content);
-				}
+				shared_ptr<ExamineContentJob> job(new ExamineContentJob(film, content));
+				jm->add (job);
+				jobs.push_back (job);
 			}
 		} catch (boost::filesystem::filesystem_error& e) {
 			/* Never mind */
@@ -114,6 +105,26 @@ ContentView::update ()
 			/* Never mind */
 		}
 	}
+
+	while (jm->work_to_do()) {
+		if (!progress.Pulse()) {
+			/* user pressed cancel */
+			BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+				i->cancel();
+			}
+			return;
+		}
+		dcpomatic_sleep (1);
+	}
+
+	/* Add content from successful jobs and report errors */
+	BOOST_FOREACH (shared_ptr<ExamineContentJob> i, jobs) {
+		if (i->finished_in_error()) {
+			error_dialog(this, std_to_wx(i->error_summary()) + ".\n", std_to_wx(i->error_details()));
+		} else {
+			add (i->content());
+		}
+	}
 }
 
 void