summaryrefslogtreecommitdiff
path: root/src/lib/job.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-07 15:29:03 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-07 15:29:03 +0100
commitfe4a806a8685e8f6932465e10d09723f75bfb1cb (patch)
tree25b81766a1235d1a192a1ec4ad4566a9d582c1dc /src/lib/job.h
parentb5b200e3e8c4134e8fdc31f2d24dcb197e6fc741 (diff)
Fix confusion about elapsed time of total job vs sub-job.
Diffstat (limited to 'src/lib/job.h')
-rw-r--r--src/lib/job.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/job.h b/src/lib/job.h
index 7bc051142..804755ef8 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -65,7 +65,6 @@ public:
std::string error_summary () const;
std::string error_details () const;
- int elapsed_time () const;
virtual std::string status () const;
std::string json_status () const;
std::string sub_name () const {
@@ -103,6 +102,7 @@ protected:
void set_state (State);
void set_error (std::string s, std::string d);
+ int elapsed_sub_time () const;
boost::shared_ptr<const Film> _film;
@@ -121,8 +121,10 @@ private:
std::string _error_summary;
std::string _error_details;
- /** time that this sub-job was started */
+ /** time that this job was started */
time_t _start_time;
+ /** time that this sub-job was started */
+ time_t _sub_start_time;
std::string _sub_name;
/** mutex for _progress and _last_progress_update */