Merge branch 'master' of github.com:FacialTurd/PowderToypp

4 files changed, 66 insertions, 14 deletions

diff --git a/src/tasks/Task.cpp b/src/tasks/Task.cpp
index c20a0ea..ec0ae99 100644
--- a/src/tasks/Task.cpp
+++ b/src/tasks/Task.cpp
@@ -17,6 +17,8 @@ void Task::SetTaskListener(TaskListener * listener)
 
 void Task::Start()
 {
+	pthread_mutex_init (&taskMutex, NULL);
+	pthread_cond_init(&taskCond, NULL);
 	pthread_create(&doWorkThread, 0, &Task::doWork_helper, this);
 }
 
@@ -35,6 +37,42 @@ bool Task::GetDone()
 	return done;
 }
 
+void Task::Poll()
+{
+	int newProgress;
+	bool newDone;
+	std::string newStatus;
+	pthread_mutex_lock(&taskMutex);
+	newProgress = thProgress;
+	newDone = thDone;
+	newStatus = std::string(thStatus);
+	pthread_cond_signal(&taskCond);
+	pthread_mutex_unlock(&taskMutex);
+
+	if(newProgress!=progress) {
+		progress = newProgress;
+		if(listener)
+			listener->NotifyProgress(this);
+	}
+	if(newStatus!=status) {
+		status = newStatus;
+		if(listener)
+			listener->NotifyStatus(this);
+	}
+	if(newDone!=done)
+	{
+		done = newDone;
+		if(listener)
+			listener->NotifyDone(this);
+	}
+
+	if(done)
+	{
+		pthread_join(doWorkThread, NULL);
+		pthread_mutex_destroy(&taskMutex);
+	}
+}
+
 Task::~Task()
 {
 
@@ -59,26 +97,24 @@ void * Task::doWork_helper(void * ref)
 
 void Task::notifyProgress(int progress)
 {
-	if(this->progress!=progress) {
-		this->progress = progress;
-		if(listener)
-			listener->NotifyProgress(this);
-	}
+	pthread_mutex_lock(&taskMutex);
+	pthread_cond_wait(&taskCond, &taskMutex);
+	thProgress = progress;
+	pthread_mutex_unlock(&taskMutex);
 }
 
 void Task::notifyStatus(std::string status)
 {
-	if(this->status!=status) {
-		this->status = status;
-		if(listener)
-			listener->NotifyStatus(this);
-	}
+	pthread_mutex_lock(&taskMutex);
+	pthread_cond_wait(&taskCond, &taskMutex);
+	thStatus = status;
+	pthread_mutex_unlock(&taskMutex);
 }
 
 void Task::notifyDone()
 {
-	if(listener)
-	{
-		done = true; listener->NotifyDone(this);
-	}
+	pthread_mutex_lock(&taskMutex);
+	pthread_cond_wait(&taskCond, &taskMutex);
+	thDone = true;
+	pthread_mutex_unlock(&taskMutex);
 }
diff --git a/src/tasks/Task.h b/src/tasks/Task.h
index 90463cb..d5ccd4b 100644
--- a/src/tasks/Task.h
+++ b/src/tasks/Task.h
@@ -20,16 +20,26 @@ public:
 	int GetProgress();
 	bool GetDone();
 	std::string GetStatus();
+	void Poll();
 	Task() {}
 	virtual ~Task();
 protected:
 	int progress;
 	bool done;
 	std::string status;
+
+	int thProgress;
+	bool thDone;
+	std::string thStatus;
+
 	TaskListener * listener;
 	pthread_t doWorkThread;
+	pthread_mutex_t taskMutex;
+	pthread_cond_t taskCond;
+
 	virtual void doWork();
 	static void * doWork_helper(void * ref);
+
 	void notifyProgress(int progress);
 	void notifyStatus(std::string status);
 	void notifyDone();
diff --git a/src/tasks/TaskWindow.cpp b/src/tasks/TaskWindow.cpp
index ac22c79..e0e71bf 100644
--- a/src/tasks/TaskWindow.cpp
+++ b/src/tasks/TaskWindow.cpp
@@ -48,6 +48,11 @@ void TaskWindow::NotifyProgress(Task * task)
 	progress = task->GetProgress();
 }
 
+void TaskWindow::OnTick(float dt)
+{
+	task->Poll();
+}
+
 void TaskWindow::OnDraw()
 {
 	Graphics * g = ui::Engine::Ref().g;
diff --git a/src/tasks/TaskWindow.h b/src/tasks/TaskWindow.h
index cacb59c..d7edf8b 100644
--- a/src/tasks/TaskWindow.h
+++ b/src/tasks/TaskWindow.h
@@ -25,6 +25,7 @@ public:
 	virtual void NotifyStatus(Task * task);
 	virtual void NotifyDone(Task * task);
 	virtual void NotifyProgress(Task * task);
+	virtual void OnTick(float dt);
 	virtual void OnDraw();
 	virtual ~TaskWindow();
 };