X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=05a90524c9818615112b77464da5a56bd154ec69;hb=0acdcc34f5d582474d586f75d5be627155ad9e08;hp=18df40878f8feafae345fa64786be06d51e0ecaf;hpb=69812a7d02f5714a80a0a131b96f5f76a8f3c3a3;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 18df40878..547b484a3 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,29 +23,34 @@ #include #include -#include +#include #include "job.h" #include "util.h" #include "cross.h" #include "ui_signaller.h" #include "exceptions.h" +#include "film.h" +#include "log.h" #include "i18n.h" using std::string; using std::list; -using std::stringstream; +using std::cout; using boost::shared_ptr; +using boost::optional; + +#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); Job::Job (shared_ptr f) : _film (f) , _thread (0) , _state (NEW) , _start_time (0) - , _progress_unknown (false) + , _progress (0) , _ran_for (0) { - descend (1); + } /** Start the job in a separate thread, returning immediately */ @@ -65,11 +70,8 @@ Job::run_wrapper () run (); - } catch (libdcp::FileError& e) { - - set_progress (1); - set_state (FINISHED_ERROR); - + } catch (dcp::FileError& e) { + string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf()); try { @@ -83,39 +85,48 @@ Job::run_wrapper () } set_error (e.what(), m); - - } catch (OpenFileError& e) { - set_progress (1); set_state (FINISHED_ERROR); + + } catch (OpenFileError& e) { 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."), e.file().string()) ); + set_progress (1); + set_state (FINISHED_ERROR); + } catch (boost::thread_interrupted &) { set_state (FINISHED_CANCELLED); - - } catch (std::exception& e) { + } catch (std::bad_alloc& e) { + + set_error (_("Out of memory"), _("There was not enough memory to do this.")); set_progress (1); set_state (FINISHED_ERROR); + + } catch (std::exception& e) { + set_error ( e.what (), - _("It is not known what caused this error. The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)") + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM ); - } catch (...) { - set_progress (1); set_state (FINISHED_ERROR); + + } catch (...) { + set_error ( _("Unknown error"), - _("It is not known what caused this error. The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)") + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM ); + set_progress (1); + set_state (FINISHED_ERROR); } } @@ -179,18 +190,25 @@ Job::paused () const void Job::set_state (State s) { - boost::mutex::scoped_lock lm (_state_mutex); - _state = s; + bool finished = false; + + { + boost::mutex::scoped_lock lm (_state_mutex); + _state = s; - if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) { - _ran_for = elapsed_time (); - if (ui_signaller) { - ui_signaller->emit (boost::bind (boost::ref (Finished))); + if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) { + _ran_for = elapsed_time (); + finished = true; + _sub_name.clear (); } } + + if (finished && ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Finished))); + } } -/** @return Time (in seconds) that this job has been running */ +/** @return DCPTime (in seconds) that this sub-job has been running */ int Job::elapsed_time () const { @@ -205,15 +223,20 @@ Job::elapsed_time () const * @param p Progress (from 0 to 1) */ void -Job::set_progress (float p) +Job::set_progress (float p, bool force) { + if (!force && fabs (p - progress().get_value_or(0)) < 0.01) { + /* Calm excessive progress reporting */ + return; + } + boost::mutex::scoped_lock lm (_progress_mutex); - _progress_unknown = false; - _stack.back().normalised = p; + _progress = p; boost::this_thread::interruption_point (); - if (paused ()) { - dcpomatic_sleep (1); + boost::mutex::scoped_lock lm2 (_state_mutex); + while (_state == PAUSED) { + _pause_changed.wait (lm2); } if (ui_signaller) { @@ -221,54 +244,23 @@ Job::set_progress (float p) } } -/** @return fractional overall progress, or -1 if not known */ -float -Job::overall_progress () const +/** @return fractional progress of the current sub-job, if known */ +optional +Job::progress () const { boost::mutex::scoped_lock lm (_progress_mutex); - if (_progress_unknown) { - return -1; - } - - float overall = 0; - float factor = 1; - for (list::const_iterator i = _stack.begin(); i != _stack.end(); ++i) { - factor *= i->allocation; - overall += i->normalised * factor; - } - - if (overall > 1) { - overall = 1; - } - - return overall; + return _progress; } -/** Ascend up one level in terms of progress reporting; see descend() */ void -Job::ascend () +Job::sub (string n) { - boost::mutex::scoped_lock lm (_progress_mutex); + { + boost::mutex::scoped_lock lm (_progress_mutex); + _sub_name = n; + } - assert (!_stack.empty ()); - float const a = _stack.back().allocation; - _stack.pop_back (); - _stack.back().normalised += a; -} - -/** Descend down one level in terms of progress reporting; e.g. if - * there is a task which is split up into N subtasks, each of which - * report their progress from 0 to 100%, call descend() before executing - * each subtask, and ascend() afterwards to ensure that overall progress - * is reported correctly. - * - * @param a Fraction (from 0 to 1) of the current task to allocate to the subtask. - */ -void -Job::descend (float a) -{ - boost::mutex::scoped_lock lm (_progress_mutex); - _stack.push_back (Level (a)); + set_progress (0, true); } string @@ -292,6 +284,10 @@ Job::error_summary () const void Job::set_error (string s, string d) { + LOG_ERROR_NC (s); + LOG_ERROR_NC (d); + + _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR); boost::mutex::scoped_lock lm (_state_mutex); _error_summary = s; _error_details = d; @@ -302,27 +298,33 @@ void Job::set_progress_unknown () { boost::mutex::scoped_lock lm (_progress_mutex); - _progress_unknown = true; + _progress.reset (); + lm.unlock (); + + if (ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Progress))); + } } /** @return Human-readable status of this job */ string Job::status () const { - float const p = overall_progress (); + optional p = progress (); int const t = elapsed_time (); int const r = remaining_time (); - int pc = rint (p * 100); - if (pc == 100) { - /* 100% makes it sound like we've finished when we haven't */ - pc = 99; - } - - stringstream s; - if (!finished ()) { + SafeStringStream s; + if (!finished () && p) { + int pc = rint (p.get() * 100); + if (pc == 100) { + /* 100% makes it sound like we've finished when we haven't */ + pc = 99; + } + s << pc << N_("%"); - if (p >= 0 && t > 10 && r > 0) { + + 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"); @@ -330,7 +332,7 @@ Job::status () const } else if (finished_ok ()) { s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for)); } else if (finished_in_error ()) { - s << String::compose (_("Error (%1)"), error_summary()); + s << String::compose (_("Error (%1)"), error_summary ()); } else if (finished_cancelled ()) { s << _("Cancelled"); } @@ -338,11 +340,15 @@ Job::status () const return s.str (); } -/** @return An estimate of the remaining time for this job, in seconds */ +/** @return An estimate of the remaining time for this sub-job, in seconds */ int Job::remaining_time () const { - return elapsed_time() / overall_progress() - elapsed_time(); + if (progress().get_value_or(0) == 0) { + return elapsed_time (); + } + + return elapsed_time() / progress().get() - elapsed_time(); } void @@ -361,6 +367,7 @@ Job::pause () { if (running ()) { set_state (PAUSED); + _pause_changed.notify_all (); } } @@ -369,5 +376,6 @@ Job::resume () { if (paused ()) { set_state (RUNNING); + _pause_changed.notify_all (); } }