/*
- 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.
using boost::shared_ptr;
using boost::optional;
using boost::function;
+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)
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 ()
+{
+ boost::this_thread::disable_interruption dis;
- delete _thread;
+ _thread.interrupt ();
+ try {
+ _thread.join ();
+ } catch (...) {}
}
/** Start the job in a separate thread, returning immediately */
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");
+ pthread_setname_np (_thread.native_handle(), "job-wrapper");
#endif
}
set_progress (1);
set_state (FINISHED_ERROR);
+ } catch (dcp::StartCompressionError& e) {
+
+ bool done = false;
+
+#ifdef DCPOMATIC_WINDOWS
+#if (__GNUC__ && !__x86_64__)
+ /* 32-bit */
+ set_error (
+ _("Failed to encode the DCP."),
+ _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic and "
+ "trying to use too many encoding threads. Please reduce the 'number of threads DCP-o-matic should "
+ "use' in the General tab of Preferences and try again.")
+ );
+ done = true;
+#else
+ /* 64-bit */
+ if (running_32_on_64()) {
+ set_error (
+ _("Failed to encode the DCP."),
+ _("This error has probably occurred because you are running the 32-bit version of DCP-o-matic. Please re-install DCP-o-matic with the 64-bit installer and try again.")
+ );
+ done = true;
+ }
+#endif
+#endif
+
+ if (!done) {
+ set_error (
+ e.what (),
+ string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM
+ );
+ }
+
+ set_progress (1);
+ set_state (FINISHED_ERROR);
+
} catch (OpenFileError& e) {
set_error (
set_progress (1);
set_state (FINISHED_ERROR);
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
set_error (e.message(), e.detail().get_value_or(""));
set_progress (1);
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 (
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.
void
Job::cancel ()
{
- if (!_thread) {
+ if (!_thread.joinable()) {
return;
}
resume ();
}
- _thread->interrupt ();
- DCPOMATIC_ASSERT (_thread->joinable ());
- _thread->join ();
- delete _thread;
- _thread = 0;
+ _thread.interrupt ();
+ _thread.join ();
}
/** @return true if the job was paused, false if it was not running */