X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fjob.h;h=e5552e49ea8f63acec13443fccf29cc3d6f6b7a9;hp=fee887b428673d3501112bc613408a76e4fab2e7;hb=c6871fe8617b3de03662b7630355059393bf8043;hpb=3fc9a435a720d8b2abd78c1bdc7b34bc635ad797 diff --git a/src/lib/job.h b/src/lib/job.h index fee887b42..e5552e49e 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,52 +22,71 @@ * @brief A parent class to represent long-running tasks which are run in their own thread. */ -#ifndef DVDOMATIC_JOB_H -#define DVDOMATIC_JOB_H +#ifndef DCPOMATIC_JOB_H +#define DCPOMATIC_JOB_H -#include +#include "signaller.h" #include -#include +#include +#include +#include +#include -class Log; -class FilmState; -class Options; +class Film; /** @class Job * @brief A parent class to represent long-running tasks which are run in their own thread. */ -class Job +class Job : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { public: - Job (boost::shared_ptr s, boost::shared_ptr o, Log* l); + explicit Job (boost::shared_ptr film); + virtual ~Job (); /** @return user-readable name of this job */ virtual std::string name () const = 0; + virtual std::string json_name () const = 0; /** Run this job in the current thread. */ virtual void run () = 0; - + void start (); + void pause_by_user (); + void pause_by_priority (); + void resume (); + void cancel (); + bool is_new () const; bool running () const; bool finished () const; bool finished_ok () const; bool finished_in_error () const; + bool finished_cancelled () const; + bool paused_by_user () const; + bool paused_by_priority () const; - std::string error () const; + 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 { + return _sub_name; + } void set_progress_unknown (); - void set_progress (float); - void ascend (); - void descend (float); - float overall_progress () const; + void set_progress (float, bool force = false); + void sub (std::string); + boost::optional progress () const; + + boost::shared_ptr film () const { + return _film; + } - void emit_finished (); + void when_finished (boost::signals2::connection& connection, boost::function finished); - /** Emitted from the GUI thread */ - sigc::signal0 Finished; + boost::signals2::signal Progress; + /** Emitted from the UI thread when the job is finished */ + boost::signals2::signal Finished; protected: @@ -74,50 +94,54 @@ protected: /** Description of a job's state */ enum State { - NEW, ///< the job hasn't been started yet - RUNNING, ///< the job is running - FINISHED_OK, ///< the job has finished successfully - FINISHED_ERROR ///< the job has finished in error + NEW, ///< the job hasn't been started yet + RUNNING, ///< the job is running + PAUSED_BY_USER, ///< the job has been paused + PAUSED_BY_PRIORITY, ///< the job has been paused + FINISHED_OK, ///< the job has finished successfully + FINISHED_ERROR, ///< the job has finished in error + FINISHED_CANCELLED ///< the job was cancelled }; - + void set_state (State); - void set_error (std::string e); + void set_error (std::string s, std::string d); + int elapsed_sub_time () const; + void check_for_interruption_or_pause (); - /** FilmState for this job */ - boost::shared_ptr _fs; - /** options in use for this job */ - boost::shared_ptr _opt; - /** a log that this job can write to */ - Log* _log; + boost::shared_ptr _film; private: void run_wrapper (); + void set_progress_common (boost::optional p); + + boost::thread* _thread; /** mutex for _state and _error */ mutable boost::mutex _state_mutex; /** current state of the job */ State _state; - /** message for an error that has occurred (when state == FINISHED_ERROR) */ - std::string _error; + /** summary of an error that has occurred (when state == FINISHED_ERROR) */ + std::string _error_summary; + std::string _error_details; /** 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 _stack and _progress_unknown */ + /** mutex for _progress and _last_progress_update */ mutable boost::mutex _progress_mutex; + boost::optional _progress; + boost::optional _last_progress_update; - struct Level { - Level (float a) : allocation (a), normalised (0) {} - - float allocation; - float normalised; - }; - - std::list _stack; + /** condition to signal changes to pause/resume so that we know when to wake; + this could be a general _state_change if it made more sense. + */ + boost::condition_variable _pause_changed; - /** true if this job's progress will always be unknown */ - bool _progress_unknown; + int _ran_for; }; #endif