X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=2db91a177cc08c194644e7b35efc7095e577cddd;hb=44b57d623dec97a3f9955082f0b8a7a8d27b7518;hp=93fdbd27a8d43472a1a93b64aad2a05b4a978c67;hpb=076451f9f32e8052480968c004f6830403df7638;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 93fdbd27a..2db91a177 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -37,19 +37,28 @@ JobManager::JobManager ()
 	boost::thread (boost::bind (&JobManager::scheduler, this));
 }
 
-void
+shared_ptr<Job>
 JobManager::add (shared_ptr<Job> j)
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	
 	_jobs.push_back (j);
+	return j;
+}
+
+void
+JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j)
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after);
+	assert (i != _jobs.end ());
+	++i;
+	_jobs.insert (i, j);
 }
 
 list<shared_ptr<Job> >
 JobManager::get () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	
 	return _jobs;
 }
 
@@ -65,25 +74,41 @@ JobManager::work_to_do () const
 	return i != _jobs.end ();
 }
 
+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 ()) {
+			return true;
+		}
+	}
+
+	return false;
+}	
+
+
 void
 JobManager::scheduler ()
 {
 	while (1) {
 		{
 			boost::mutex::scoped_lock lm (_mutex);
-			int running = 0;
-			shared_ptr<Job> first_new;
 			for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
 				if ((*i)->running ()) {
-					++running;
-				} else if (!(*i)->finished () && first_new == 0) {
-					first_new = *i;
-				}
-
-				if (running == 0 && first_new) {
-					first_new->start ();
+					/* Something is already happening */
 					break;
 				}
+				
+				if ((*i)->is_new()) {
+					shared_ptr<Job> r = (*i)->required ();
+					if (!r || r->finished_ok ()) {
+						(*i)->start ();
+
+						/* Only start one job at once */
+						break;
+					}
+				}
 			}
 		}