4 files changed, 47 insertions, 1 deletions

diff --git a/src/thread/thread.h b/src/thread/thread.h
index 22873bee5..98c48d15d 100644
--- a/src/thread/thread.h
+++ b/src/thread/thread.h
@@ -68,6 +68,19 @@ public:
 	 * End of the critical section
 	 */
 	virtual void EndCritical() = 0;
+
+	/**
+	 * Wait for a signal to be send.
+	 * @pre You must be in the critical section.
+	 * @note While waiting the critical section is left.
+	 * @post You will be in the critical section.
+	 */
+	virtual void WaitForSignal() = 0;
+
+	/**
+	 * Send a signal and wake the 'thread' that was waiting for it.
+	 */
+	virtual void SendSignal() = 0;
 };
 
 #endif /* THREAD_H */
diff --git a/src/thread/thread_none.cpp b/src/thread/thread_none.cpp
index 861f2cfd6..67679bc81 100644
--- a/src/thread/thread_none.cpp
+++ b/src/thread/thread_none.cpp
@@ -23,6 +23,8 @@ class ThreadMutex_None : public ThreadMutex {
 public:
 	virtual void BeginCritical() {}
 	virtual void EndCritical() {}
+	virtual void WaitForSignal() {}
+	virtual void SendSignal() {}
 };
 
 /* static */ ThreadMutex *ThreadMutex::New()
diff --git a/src/thread/thread_pthread.cpp b/src/thread/thread_pthread.cpp
index 483b71c0f..ca1fb8f5a 100644
--- a/src/thread/thread_pthread.cpp
+++ b/src/thread/thread_pthread.cpp
@@ -12,6 +12,7 @@
 #include "../stdafx.h"
 #include "thread.h"
 #include <pthread.h>
+#include <errno.h>
 
 /**
  * POSIX pthread version for ThreadObject.
@@ -95,16 +96,21 @@ private:
 class ThreadMutex_pthread : public ThreadMutex {
 private:
 	pthread_mutex_t mutex;
+	pthread_cond_t condition;
 
 public:
 	ThreadMutex_pthread()
 	{
 		pthread_mutex_init(&this->mutex, NULL);
+		pthread_cond_init(&this->condition, NULL);
 	}
 
 	/* virtual */ ~ThreadMutex_pthread()
 	{
-		pthread_mutex_destroy(&this->mutex);
+		int err = pthread_cond_destroy(&this->condition);
+		assert(err != EBUSY);
+		err = pthread_mutex_destroy(&this->mutex);
+		assert(err != EBUSY);
 	}
 
 	/* virtual */ void BeginCritical()
@@ -116,6 +122,16 @@ public:
 	{
 		pthread_mutex_unlock(&this->mutex);
 	}
+
+	/* virtual */ void WaitForSignal()
+	{
+		pthread_cond_wait(&this->condition, &this->mutex);
+	}
+
+	/* virtual */ void SendSignal()
+	{
+		pthread_cond_signal(&this->condition);
+	}
 };
 
 /* static */ ThreadMutex *ThreadMutex::New()
diff --git a/src/thread/thread_win32.cpp b/src/thread/thread_win32.cpp
index e752de1ae..a3b2d3734 100644
--- a/src/thread/thread_win32.cpp
+++ b/src/thread/thread_win32.cpp
@@ -107,16 +107,19 @@ private:
 class ThreadMutex_Win32 : public ThreadMutex {
 private:
 	CRITICAL_SECTION critical_section;
+	HANDLE event;
 
 public:
 	ThreadMutex_Win32()
 	{
 		InitializeCriticalSection(&this->critical_section);
+		this->event = CreateEvent(NULL, FALSE, FALSE, NULL);
 	}
 
 	/* virtual */ ~ThreadMutex_Win32()
 	{
 		DeleteCriticalSection(&this->critical_section);
+		CloseHandle(this->event);
 	}
 
 	/* virtual */ void BeginCritical()
@@ -128,6 +131,18 @@ public:
 	{
 		LeaveCriticalSection(&this->critical_section);
 	}
+
+	/* virtual */ void WaitForSignal()
+	{
+		this->EndCritical();
+		WaitForSingleObject(this->event, INFINITE);
+		this->BeginCritical();
+	}
+
+	/* virtual */ void SendSignal()
+	{
+		SetEvent(this->event);
+	}
 };
 
 /* static */ ThreadMutex *ThreadMutex::New()