projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index a382dd7363732cc4ddd20fad782005bd438ea2ff..4fe1e45d6b337302611d2c500721dfb719df0e88 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,45
+18,69
@@
*/
*/
+
/** @file src/job_manager.h
* @brief A simple scheduler for jobs.
*/
/** @file src/job_manager.h
* @brief A simple scheduler for jobs.
*/
+
#include "signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#include "signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
#include <list>
#include <list>
+
class Job;
class Film;
class Playlist;
class Job;
class Film;
class Playlist;
+class Content;
+struct threed_test7;
+
extern bool wait_for_jobs ();
extern bool wait_for_jobs ();
+
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
-class JobManager : public Signaller
, public boost::noncopyable
+class JobManager : public Signaller
{
public:
{
public:
- boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
- boost::shared_ptr<Job> add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
- std::list<boost::shared_ptr<Job> > get () const;
+ JobManager (JobManager const&) = delete;
+ JobManager& operator= (JobManager const&) = delete;
+
+ std::shared_ptr<Job> add (std::shared_ptr<Job>);
+ std::shared_ptr<Job> add_after (std::shared_ptr<Job> after, std::shared_ptr<Job> j);
+ std::list<std::shared_ptr<Job>> get () const;
bool work_to_do () const;
bool errors () const;
bool work_to_do () const;
bool errors () const;
- void increase_priority (boost::shared_ptr<Job>);
- void decrease_priority (boost::shared_ptr<Job>);
+ void increase_priority (std::shared_ptr<Job>);
+ void decrease_priority (std::shared_ptr<Job>);
+ void pause ();
+ void resume ();
+ bool paused () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _paused;
+ }
void analyse_audio (
void analyse_audio (
-
boost
::shared_ptr<const Film> film,
-
boost
::shared_ptr<const Playlist> playlist,
+
std
::shared_ptr<const Film> film,
+
std
::shared_ptr<const Playlist> playlist,
bool from_zero,
boost::signals2::connection& connection,
boost::function<void()> ready
);
bool from_zero,
boost::signals2::connection& connection,
boost::function<void()> ready
);
- boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
+ void analyse_subtitles (
+ std::shared_ptr<const Film> film,
+ std::shared_ptr<Content> content,
+ boost::signals2::connection& connection,
+ boost::function<void()> ready
+ );
+
+ boost::signals2::signal<void (std::weak_ptr<Job>)> JobAdded;
boost::signals2::signal<void ()> JobsReordered;
boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
boost::signals2::signal<void ()> JobsReordered;
boost::signals2::signal<void (boost::optional<std::string>, boost::optional<std::string>)> ActiveJobsChanged;
@@
-66,20
+90,26
@@
public:
private:
/* This function is part of the test suite */
friend bool ::wait_for_jobs ();
private:
/* This function is part of the test suite */
friend bool ::wait_for_jobs ();
+ friend struct threed_test7;
JobManager ();
~JobManager ();
void scheduler ();
void start ();
void priority_changed ();
JobManager ();
~JobManager ();
void scheduler ();
void start ();
void priority_changed ();
+ void job_finished ();
mutable boost::mutex _mutex;
mutable boost::mutex _mutex;
+ boost::condition _empty_condition;
/** List of jobs in the order that they will be executed */
/** List of jobs in the order that they will be executed */
- std::list<boost::shared_ptr<Job> > _jobs;
- bool _terminate;
+ std::list<std::shared_ptr<Job>> _jobs;
+ std::list<boost::signals2::connection> _connections;
+ bool _terminate = false;
+ bool _paused = false;
+ std::shared_ptr<Job> _paused_job;
boost::optional<std::string> _last_active_job;
boost::optional<std::string> _last_active_job;
- boost::thread
*
_scheduler;
+ boost::thread _scheduler;
static JobManager* _instance;
};
static JobManager* _instance;
};