X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=a83249e798feba99abafc2a09f1393eb8cf5dc18;hb=5e6588090b65217e180a35bac494ede030406858;hp=b5be02b4c2ce0a9da71196383b4b16fecd4619b0;hpb=3369f4376a13fc9e68edaa4e674b286e5df4b021;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index b5be02b4c..a83249e79 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
 #include <dcp/exceptions.h>
 #include <sub/exceptions.h>
@@ -45,14 +46,11 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::function;
-
-#define LOG_ERROR_NC(...) if (_film) { _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR); }
-#define LOG_GENERAL(...) if (_film) { _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); }
+using namespace dcpomatic;
 
 /** @param film Associated film, or 0 */
 Job::Job (shared_ptr<const Film> film)
 	: _film (film)
-	, _thread (0)
 	, _state (NEW)
 	, _start_time (0)
 	, _sub_start_time (0)
@@ -64,19 +62,25 @@ Job::Job (shared_ptr<const Film> film)
 
 Job::~Job ()
 {
-	if (_thread) {
-		_thread->interrupt ();
-		/* We can't use DCPOMATIC_ASSERT here as it may throw an exception */
-		if (_thread->joinable ()) {
-			try {
-				_thread->join ();
-			} catch (...) {
-				/* Too late to do anything about this */
-			}
-		}
+#ifdef DCPOMATIC_DEBUG
+	/* Any subclass should have called stop_thread in its destructor */
+	assert (!_thread.joinable());
+#endif
+}
+
+void
+Job::stop_thread ()
+{
+	if (!_thread.joinable()) {
+		return;
 	}
 
-	delete _thread;
+	_thread.interrupt ();
+	try {
+		_thread.join ();
+	} catch (...) {
+		/* Too late to do anything about this */
+	}
 }
 
 /** Start the job in a separate thread, returning immediately */
@@ -86,7 +90,10 @@ Job::start ()
 	set_state (RUNNING);
 	_start_time = time (0);
 	_sub_start_time = time (0);
-	_thread = new boost::thread (boost::bind (&Job::run_wrapper, this));
+	_thread = boost::thread (boost::bind(&Job::run_wrapper, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_thread.native_handle(), "job-wrapper");
+#endif
 }
 
 /** A wrapper for the ::run() method to catch exceptions */
@@ -171,6 +178,24 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (dcp::DCPReadError& e) {
+
+		set_error (e.message(), e.detail().get_value_or(""));
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
+	} catch (KDMError& e) {
+
+		set_error (e.summary(), e.detail());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
+	} catch (FileError& e) {
+
+		set_error (e.what(), e.what());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
@@ -275,6 +300,7 @@ Job::set_state (State s)
 
 	if (finished) {
 		emit (boost::bind (boost::ref (Finished)));
+		FinishedImmediate ();
 	}
 }
 
@@ -384,8 +410,6 @@ void
 Job::set_error (string s, string d)
 {
 	if (_film) {
-		LOG_ERROR_NC (s);
-		LOG_ERROR_NC (d);
 		_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR);
 	}
 
@@ -425,13 +449,13 @@ Job::status () const
 		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);
-			char finish_string[6];
-			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", finish.time_of_day().hours(), finish.time_of_day().minutes());
+			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;
 			if (now.date() != finish.date()) {
 				/// TRANSLATORS: the %1 in this string will be filled in with a day of the week
 				/// to say what day a job will finish.
-				day = String::compose (_(" on %1"), finish.date().day_of_week().as_long_string());
+				day = String::compose (_(" on %1"), day_of_week_to_string(finish.date().day_of_week()));
 			}
 			/// TRANSLATORS: "remaining; finishing at" here follows an amount of time that is remaining
 			/// on an operation; after it is an estimated wall-clock completion time.
@@ -489,7 +513,7 @@ Job::remaining_time () const
 void
 Job::cancel ()
 {
-	if (!_thread) {
+	if (!_thread.joinable()) {
 		return;
 	}
 
@@ -497,20 +521,31 @@ Job::cancel ()
 		resume ();
 	}
 
-	_thread->interrupt ();
-	DCPOMATIC_ASSERT (_thread->joinable ());
-	_thread->join ();
-	delete _thread;
-	_thread = 0;
+	_thread.interrupt ();
+	_thread.join ();
 }
 
-void
+/** @return true if the job was paused, false if it was not running */
+bool
 Job::pause_by_user ()
 {
-	if (running ()) {
-		set_state (PAUSED_BY_USER);
+	bool paused = false;
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		/* We can set _state here directly because we have a lock and we aren't
+		   setting the job to FINISHED_*
+		*/
+		if (_state == RUNNING) {
+			paused = true;
+			_state = PAUSED_BY_USER;
+		}
+	}
+
+	if (paused) {
 		_pause_changed.notify_all ();
 	}
+
+	return paused;
 }
 
 void
@@ -541,3 +576,17 @@ Job::when_finished (boost::signals2::connection& connection, function<void()> fi
 		connection = Finished.connect (finished);
 	}
 }
+
+optional<string>
+Job::message () const
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return _message;
+}
+
+void
+Job::set_message (string m)
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	_message = m;
+}