X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=a83249e798feba99abafc2a09f1393eb8cf5dc18;hp=1676928632164410582e179c97d5e3c5e7842c33;hb=caf67bef2611a911307267b20dbf3be89ffff71f;hpb=66ba4487fa7bbf7a48d428dd49ce634cd62004d3 diff --git a/src/lib/job.cc b/src/lib/job.cc index 167692863..a83249e79 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -28,12 +28,14 @@ #include "exceptions.h" #include "film.h" #include "log.h" +#include "dcpomatic_log.h" #include "compose.hpp" #include #include #include #include #include +#include #include #include "i18n.h" @@ -44,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 film) : _film (film) - , _thread (0) , _state (NEW) , _start_time (0) , _sub_start_time (0) @@ -63,19 +62,25 @@ Job::Job (shared_ptr 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 */ @@ -85,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 */ @@ -119,8 +127,9 @@ Job::run_wrapper () set_error ( String::compose (_("Could not open %1"), e.file().string()), String::compose ( - _("DCP-o-matic could not open the file %1. Perhaps it does not exist or is in an unexpected format."), - boost::filesystem::absolute (e.file()).string() + _("DCP-o-matic could not open the file %1 (%2). Perhaps it does not exist or is in an unexpected format."), + boost::filesystem::absolute (e.file()).string(), + e.what() ) ); @@ -133,8 +142,9 @@ Job::run_wrapper () set_error ( String::compose (_("Could not open %1"), e.path1().string ()), String::compose ( - _("DCP-o-matic could not open the file %1. Perhaps it does not exist or is in an unexpected format."), - boost::filesystem::absolute (e.path1()).string() + _("DCP-o-matic could not open the file %1 (%2). Perhaps it does not exist or is in an unexpected format."), + boost::filesystem::absolute (e.path1()).string(), + e.what() ) ); } else { @@ -168,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 ( @@ -238,10 +266,17 @@ Job::finished_cancelled () const } bool -Job::paused () const +Job::paused_by_user () const { boost::mutex::scoped_lock lm (_state_mutex); - return _state == PAUSED; + return _state == PAUSED_BY_USER; +} + +bool +Job::paused_by_priority () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + return _state == PAUSED_BY_PRIORITY; } /** Set the state of this job. @@ -265,6 +300,7 @@ Job::set_state (State s) if (finished) { emit (boost::bind (boost::ref (Finished))); + FinishedImmediate (); } } @@ -286,7 +322,7 @@ Job::check_for_interruption_or_pause () boost::this_thread::interruption_point (); boost::mutex::scoped_lock lm (_state_mutex); - while (_state == PAUSED) { + while (_state == PAUSED_BY_USER || _state == PAUSED_BY_PRIORITY) { emit (boost::bind (boost::ref (Progress))); _pause_changed.wait (lm); } @@ -294,6 +330,7 @@ Job::check_for_interruption_or_pause () /** 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. */ void Job::set_progress (float p, bool force) @@ -366,14 +403,13 @@ Job::error_summary () const } /** Set the current error string. - * @param e New error string. + * @param s New error string. + * @param d New error detail string. */ 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); } @@ -411,9 +447,22 @@ Job::status () const s += buffer; if (t > 10 && r > 0) { - /// TRANSLATORS: remaining here follows an amount of time that is remaining - /// on an operation. - s += "; " + seconds_to_approximate_hms (r) + " " + _("remaining"); + 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[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"), 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. + s += String::compose( + _("; %1 remaining; finishing at %2%3"), + seconds_to_approximate_hms(r), finish_string, day + ); } } else if (finished_ok ()) { s = String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for)); @@ -436,7 +485,8 @@ Job::json_status () const return N_("new"); case RUNNING: return N_("running"); - case PAUSED: + case PAUSED_BY_USER: + case PAUSED_BY_PRIORITY: return N_("paused"); case FINISHED_OK: return N_("finished_ok"); @@ -463,26 +513,46 @@ Job::remaining_time () const void Job::cancel () { - if (!_thread) { + if (!_thread.joinable()) { return; } - if (paused ()) { + if (paused_by_user() || paused_by_priority()) { 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 */ +bool +Job::pause_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 -Job::pause () +Job::pause_by_priority () { if (running ()) { - set_state (PAUSED); + set_state (PAUSED_BY_PRIORITY); _pause_changed.notify_all (); } } @@ -490,7 +560,7 @@ Job::pause () void Job::resume () { - if (paused ()) { + if (paused_by_user() || paused_by_priority()) { set_state (RUNNING); _pause_changed.notify_all (); } @@ -506,3 +576,17 @@ Job::when_finished (boost::signals2::connection& connection, function fi connection = Finished.connect (finished); } } + +optional +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; +}