projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index 82095a143b66ec04c9ed8ee7e658bf136eaa256a..f0673df1531bd933d0ebb6662795e20e18cc9a84 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-23,38
+23,44
@@
#include <list>
#include <boost/thread/mutex.hpp>
#include <list>
#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
#include <boost/signals2.hpp>
class Job;
#include <boost/signals2.hpp>
class Job;
+extern void wait_for_jobs ();
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
/** @class JobManager
* @brief A simple scheduler for jobs.
*/
-class JobManager
+class JobManager
: public boost::noncopyable
{
public:
boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
{
public:
boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
- void add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
std::list<boost::shared_ptr<Job> > get () const;
bool work_to_do () const;
bool errors () const;
std::list<boost::shared_ptr<Job> > get () const;
bool work_to_do () const;
bool errors () const;
+ boost::signals2::signal<void (boost::weak_ptr<Job>)> JobAdded;
boost::signals2::signal<void (bool)> ActiveJobsChanged;
static JobManager* instance ();
boost::signals2::signal<void (bool)> ActiveJobsChanged;
static JobManager* instance ();
+ static void drop ();
private:
/* This function is part of the test suite */
friend void ::wait_for_jobs ();
JobManager ();
private:
/* This function is part of the test suite */
friend void ::wait_for_jobs ();
JobManager ();
+ ~JobManager ();
void scheduler ();
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
void scheduler ();
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
+ bool _terminate;
bool _last_active_jobs;
bool _last_active_jobs;
+ boost::thread* _scheduler;
static JobManager* _instance;
};
static JobManager* _instance;
};