X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=784defc91736074e53292fdbcdb4c306341d7d6f;hb=0ec7c9d0b1f3ea58ffe17dd70bea04ad702d164b;hp=5b0b9c6044475a0b11c5e84318b09df409c60908;hpb=edbb857ebfc7fa0f423ab6f402736f46a4fa058b;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 5b0b9c604..784defc91 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 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 @@ -17,20 +17,20 @@ */ -/** @file src/job.cc +/** @file src/job.cc * @brief A parent class to represent long-running tasks which are run in their own thread. */ -#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 "compose.hpp" +#include +#include +#include #include "i18n.h" @@ -38,11 +38,12 @@ using std::string; using std::list; 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) +Job::Job (shared_ptr film) + : _film (film) , _thread (0) , _state (NEW) , _start_time (0) @@ -52,6 +53,16 @@ Job::Job (shared_ptr f) } +Job::~Job () +{ + if (_thread) { + _thread->interrupt (); + _thread->join (); + } + + delete _thread; +} + /** Start the job in a separate thread, returning immediately */ void Job::start () @@ -86,7 +97,7 @@ Job::run_wrapper () set_error (e.what(), m); set_progress (1); set_state (FINISHED_ERROR); - + } catch (OpenFileError& e) { set_error ( @@ -97,6 +108,23 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); + } catch (boost::filesystem::filesystem_error& e) { + + if (e.code() == boost::system::errc::no_such_file_or_directory) { + 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."), e.path1().string()) + ); + } else { + set_error ( + e.what (), + string (_("It is not known what caused this error.")) + " " + REPORT_PROBLEM + ); + } + + set_progress (1); + set_state (FINISHED_ERROR); + } catch (boost::thread_interrupted &) { set_state (FINISHED_CANCELLED); @@ -106,7 +134,7 @@ Job::run_wrapper () 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 ( @@ -116,7 +144,7 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); - + } catch (...) { set_error ( @@ -182,7 +210,7 @@ Job::paused () const boost::mutex::scoped_lock lm (_state_mutex); return _state == PAUSED; } - + /** Set the state of this job. * @param s New state. */ @@ -202,9 +230,9 @@ Job::set_state (State s) } } - if (finished && ui_signaller) { - ui_signaller->emit (boost::bind (boost::ref (Finished))); - } + if (finished) { + emit (boost::bind (boost::ref (Finished))); + } } /** @return DCPTime (in seconds) that this sub-job has been running */ @@ -214,7 +242,7 @@ Job::elapsed_time () const if (_start_time == 0) { return 0; } - + return time (0) - _start_time; } @@ -224,11 +252,17 @@ Job::elapsed_time () const void Job::set_progress (float p, bool force) { - if (!force && fabs (p - progress()) < 0.01) { + if (!force && fabs (p - progress().get_value_or(0)) < 0.01) { /* Calm excessive progress reporting */ return; } + set_progress_common (p); +} + +void +Job::set_progress_common (optional p) +{ boost::mutex::scoped_lock lm (_progress_mutex); _progress = p; boost::this_thread::interruption_point (); @@ -238,17 +272,18 @@ Job::set_progress (float p, bool force) _pause_changed.wait (lm2); } - if (ui_signaller) { - ui_signaller->emit (boost::bind (boost::ref (Progress))); - } + lm.unlock (); + lm2.unlock (); + + emit (boost::bind (boost::ref (Progress))); } -/** @return fractional progress of the current sub-job, or -1 if not known */ -float +/** @return fractional progress of the current sub-job, if known */ +optional Job::progress () const { boost::mutex::scoped_lock lm (_progress_mutex); - return _progress.get_value_or (-1); + return _progress; } void @@ -258,7 +293,7 @@ Job::sub (string n) boost::mutex::scoped_lock lm (_progress_mutex); _sub_name = n; } - + set_progress (0, true); } @@ -285,7 +320,7 @@ 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; @@ -296,28 +331,28 @@ Job::set_error (string s, string d) void Job::set_progress_unknown () { - boost::mutex::scoped_lock lm (_progress_mutex); - _progress.reset (); + set_progress_common (optional ()); } /** @return Human-readable status of this job */ string Job::status () const { - float const p = 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; - } - SafeStringStream s; - if (!finished ()) { + if (!finished () && p) { + int pc = lrintf (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"); @@ -325,7 +360,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"); } @@ -333,11 +368,38 @@ Job::status () const return s.str (); } +string +Job::json_status () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + + switch (_state) { + case NEW: + return N_("new"); + case RUNNING: + return N_("running"); + case PAUSED: + return N_("paused"); + case FINISHED_OK: + return N_("finished_ok"); + case FINISHED_ERROR: + return N_("finished_error"); + case FINISHED_CANCELLED: + return N_("finished_cancelled"); + } + + return ""; +} + /** @return An estimate of the remaining time for this sub-job, in seconds */ int Job::remaining_time () const { - return elapsed_time() / progress() - elapsed_time(); + if (progress().get_value_or(0) == 0) { + return elapsed_time (); + } + + return elapsed_time() / progress().get() - elapsed_time(); } void @@ -347,6 +409,10 @@ Job::cancel () return; } + if (paused ()) { + resume (); + } + _thread->interrupt (); _thread->join (); }