X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=4c8199bdcc1b52294368b305f101238dd222f0c9;hp=d960dfaee99f0da96f329cc82a2b97082556f51d;hb=5723d8d8518ad1cc0fef8bcc34a47671ab959fb3;hpb=e3c7656f9dc0acbaf518c051b847ee2e4eb7ba23

diff --git a/src/lib/job.cc b/src/lib/job.cc
index d960dfaee..4c8199bdc 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -34,7 +34,6 @@
 #include <sub/exceptions.h>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
 
@@ -43,9 +42,9 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::function;
+using std::function;
 using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
@@ -96,6 +95,8 @@ Job::start ()
 void
 Job::run_wrapper ()
 {
+	start_of_thread (String::compose("Job-%1", json_name()));
+
 	try {
 
 		run ();
@@ -105,7 +106,7 @@ Job::run_wrapper ()
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
 		try {
-			boost::filesystem::space_info const s = boost::filesystem::space (e.filename());
+			auto const s = boost::filesystem::space (e.filename());
 			if (s.available < pow (1024, 3)) {
 				m += N_("\n\n");
 				m += _("The drive that the film is stored on is low in disc space.  Free some more space and try again.");
@@ -196,7 +197,7 @@ Job::run_wrapper ()
 	} catch (sub::SubripError& e) {
 
 		string extra = "Error is near:\n";
-		BOOST_FOREACH (string i, e.context()) {
+		for (auto i: e.context()) {
 			extra += i + "\n";
 		}
 
@@ -360,6 +361,22 @@ Job::check_for_interruption_or_pause ()
 	}
 }
 
+
+optional<float>
+Job::seconds_since_last_progress_update () const
+{
+	boost::mutex::scoped_lock lm (_progress_mutex);
+	if (!_last_progress_update) {
+		return {};
+	}
+
+	struct timeval now;
+	gettimeofday (&now, 0);
+
+	return seconds(now) - seconds(*_last_progress_update);
+}
+
+
 /** Set the progress of the current part of the job.
  *  @param p Progress (from 0 to 1)
  *  @param force Do not ignore this update, even if it hasn't been long since the last one.
@@ -375,8 +392,7 @@ Job::set_progress (float p, bool force)
 		struct timeval now;
 		gettimeofday (&now, 0);
 		if (_last_progress_update && _last_progress_update->tv_sec > 0) {
-			double const elapsed = (now.tv_sec + now.tv_usec / 1000000.0)
-				- (_last_progress_update->tv_sec + _last_progress_update->tv_usec / 1000000.0);
+			double const elapsed = seconds(now) - seconds(*_last_progress_update);
 			if (elapsed < 0.5) {
 				return;
 			}
@@ -479,8 +495,8 @@ Job::status () const
 		s += buffer;
 
 		if (t > 10 && r > 0) {
-			boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
-			boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
+			auto now = boost::posix_time::second_clock::local_time();
+			auto finish = now + boost::posix_time::seconds(r);
 			char finish_string[16];
 			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
 			string day;