projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
job_manager.h
diff --git
a/src/lib/job_manager.h
b/src/lib/job_manager.h
index d1d33cfc2ce7e7dc3ac4693d579d7309e0ec30e5..d0e83e26f6c13b369ba524d421c6bcd72d25e7b5 100644
(file)
--- a/
src/lib/job_manager.h
+++ b/
src/lib/job_manager.h
@@
-21,35
+21,47
@@
* @brief A simple scheduler for jobs.
*/
* @brief A simple scheduler for jobs.
*/
-#include
<list>
+#include
"signaller.h"
#include <boost/thread/mutex.hpp>
#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
+#include <boost/signals2.hpp>
+#include <list>
class Job;
class Job;
+extern void wait_for_jobs ();
/** @class JobManager
* @brief A simple scheduler for jobs.
/** @class JobManager
* @brief A simple scheduler for jobs.
- *
- * JobManager simply keeps a list of pending jobs, and assumes that all the jobs
- * are sufficiently CPU intensive that there is no point running them in parallel;
- * so jobs are just run one after the other.
*/
*/
-class JobManager
+class JobManager
: public Signaller, public boost::noncopyable
{
public:
{
public:
- void add (boost::shared_ptr<Job>);
- void add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j);
+ boost::shared_ptr<Job> add (boost::shared_ptr<Job>);
std::list<boost::shared_ptr<Job> > get () const;
bool work_to_do () 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 ();
static JobManager* instance ();
+ static void drop ();
private:
private:
+ /* This function is part of the test suite */
+ friend void ::wait_for_jobs ();
+
JobManager ();
JobManager ();
+ ~JobManager ();
void scheduler ();
void scheduler ();
-
+
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
mutable boost::mutex _mutex;
std::list<boost::shared_ptr<Job> > _jobs;
+ bool _terminate;
+
+ bool _last_active_jobs;
+ boost::thread* _scheduler;
static JobManager* _instance;
};
static JobManager* _instance;
};