X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=5b0b9c6044475a0b11c5e84318b09df409c60908;hb=ba5a89098782cc61563841fbd5976c98b141ad54;hp=8924fa09c49fcdd09cef5637f5e27496de564f0e;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 8924fa09c..5b0b9c604 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 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,31 +23,33 @@ #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::cout; -using std::stringstream; using boost::shared_ptr; +#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) - , _last_set (0) + , _progress (0) , _ran_for (0) { - descend (1); + } /** Start the job in a separate thread, returning immediately */ @@ -67,11 +69,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 { @@ -85,39 +84,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 (carl@dcpomatic.com)") + 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 (carl@dcpomatic.com)") + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM ); + set_progress (1); + set_state (FINISHED_ERROR); } } @@ -182,7 +190,7 @@ void Job::set_state (State s) { bool finished = false; - + { boost::mutex::scoped_lock lm (_state_mutex); _state = s; @@ -190,15 +198,16 @@ Job::set_state (State s) 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 { @@ -213,22 +222,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 (fabs (p - _last_set) < 0.01) { + if (!force && fabs (p - progress()) < 0.01) { /* Calm excessive progress reporting */ return; } - _last_set = p; - 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) { @@ -236,54 +243,23 @@ Job::set_progress (float p) } } -/** @return fractional overall progress, or -1 if not known */ +/** @return fractional progress of the current sub-job, or -1 if not known */ float -Job::overall_progress () const +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.get_value_or (-1); } -/** 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 @@ -307,6 +283,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; @@ -317,14 +297,14 @@ void Job::set_progress_unknown () { boost::mutex::scoped_lock lm (_progress_mutex); - _progress_unknown = true; + _progress.reset (); } /** @return Human-readable status of this job */ string Job::status () const { - float const p = overall_progress (); + float const p = progress (); int const t = elapsed_time (); int const r = remaining_time (); @@ -334,7 +314,7 @@ Job::status () const pc = 99; } - stringstream s; + SafeStringStream s; if (!finished ()) { s << pc << N_("%"); if (p >= 0 && t > 10 && r > 0) { @@ -353,11 +333,11 @@ 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(); + return elapsed_time() / progress() - elapsed_time(); } void @@ -376,6 +356,7 @@ Job::pause () { if (running ()) { set_state (PAUSED); + _pause_changed.notify_all (); } } @@ -384,5 +365,6 @@ Job::resume () { if (paused ()) { set_state (RUNNING); + _pause_changed.notify_all (); } }