X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fsemaphore.h;h=28c3b3d72cb8f009fd4474cfa73ab586db1a1d02;hp=e6c09c54437e57ed3ae0cf8903a30c920c976760;hb=HEAD;hpb=cfc8e0b7b15ea505bd6a6a9599cbc5ce1e316963

diff --git a/source/core/semaphore.h b/source/core/semaphore.h
index e6c09c5..f504289 100644
--- a/source/core/semaphore.h
+++ b/source/core/semaphore.h
@@ -1,55 +1,28 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_CORE_SEMAPHORE_H_
 #define MSP_CORE_SEMAPHORE_H_
 
-#include "mutex.h"
-#include "types.h"
-#include "../time/timedelta.h"
+#include <msp/time/timedelta.h>
+#include "mspcore_api.h"
+#include "noncopyable.h"
 
 namespace Msp {
 
-class Semaphore
+class MSPCORE_API Semaphore: private NonCopyable
 {
 private:
-	Mutex *mutex;
-	bool  own_mutex;
-	SemaphoreHandle sem;
-#ifdef WIN32
-	unsigned count;
-#endif
+	struct Private;
+
+	Private *priv = nullptr;
 
 public:
-	Semaphore();
-	Semaphore(Mutex &);
-private:
-	void init();
-public:
+	Semaphore(unsigned);
 	~Semaphore();
 
-	int   signal();
-	int   broadcast();
-	int   wait();
-	int   wait(const Time::TimeDelta &);
-	Mutex &get_mutex() { return *mutex; }
+	void signal();
+	void wait();
+	bool wait(const Time::TimeDelta &);
 };
 
-#ifndef WIN32
-inline int Semaphore::signal()
-{ return pthread_cond_signal(&sem); }
-
-inline int Semaphore::broadcast()
-{ return pthread_cond_broadcast(&sem); }
-
-inline int Semaphore::wait()
-{ return pthread_cond_wait(&sem, &mutex->mutex); }
-#endif
-
 }
 
 #endif