X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finternaltask.h;h=608ea9662609bb0e5912f65a247f193f3a292504;hb=d1eb133ab529cdae131be7b150209f03189248f3;hp=83023d3ad33c63e0826cb4e3359a9cedd3413c66;hpb=64cd148dcd762ea368d9a552e982fdff83781ef2;p=builder.git

diff --git a/source/internaltask.h b/source/internaltask.h
index 83023d3..608ea96 100644
--- a/source/internaltask.h
+++ b/source/internaltask.h
@@ -1,35 +1,45 @@
 #ifndef INTERNALTASK_H_
 #define INTERNALTASK_H_
 
+#include <functional>
 #include <msp/core/thread.h>
 #include "task.h"
 
+/**
+Runs a worker thread.  Tools should derive a thread class from
+InternalTask::Worker.  The worker thread must set its status to either SUCCESS
+or ERROR before terminating.
+*/
 class InternalTask: public Task
 {
-public:
+private:
 	class Worker: public Msp::Thread
 	{
 		friend class InternalTask;
 
-	protected:
-		Status status;
-
-		Worker();
+	private:
+		std::function<bool()> func;
+		volatile Status status = Task::RUNNING;
 
 	public:
+		Worker(std::function<bool()> f): func(f) { }
+
 		Status get_status() const { return status; }
+
+	private:
+		void main() override;
 	};
 
-private:
-	Worker *worker;
+	Worker worker;
 
 public:
-	InternalTask(Worker *);
+	InternalTask(std::function<bool()> f): worker(f) { }
 	~InternalTask();
 
-	virtual std::string get_command() const { return "<internal>"; }
-	virtual void start();
-	virtual Status check();
+	std::string get_command() const override { return "<internal>"; }
+	void start() override;
+	Status check() override;
+	Status wait() override;
 };
 
 #endif