From 4ca2fcc360bbae05e896590fd53327616f9bd2a5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Oct 2012 20:30:47 +0100 Subject: Fix ran-for display in makedcp. --- src/lib/job.cc | 7 ++++++- src/lib/job.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/job.cc b/src/lib/job.cc index 22754eb90..e78a91315 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -41,6 +41,7 @@ Job::Job (shared_ptr s, shared_ptr o, Log* l) , _state (NEW) , _start_time (0) , _progress_unknown (false) + , _ran_for (0) { assert (_log); @@ -121,6 +122,10 @@ Job::set_state (State s) { boost::mutex::scoped_lock lm (_state_mutex); _state = s; + + if (_state == FINISHED_OK || _state == FINISHED_ERROR) { + _ran_for = elapsed_time (); + } } /** A hack to work around our lack of cross-thread @@ -245,7 +250,7 @@ Job::status () const } else if (!finished () && (t <= 10 || r == 0)) { s << rint (p * 100) << "%"; } else if (finished_ok ()) { - s << "OK (ran for " << seconds_to_hms (t) << ")"; + s << "OK (ran for " << seconds_to_hms (_ran_for) << ")"; } else if (finished_in_error ()) { s << "Error (" << error() << ")"; } diff --git a/src/lib/job.h b/src/lib/job.h index b39130479..802bf468d 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -119,6 +119,8 @@ private: /** true if this job's progress will always be unknown */ bool _progress_unknown; + + int _ran_for; }; #endif -- cgit v1.2.3