Use the system call name as parameter to system_error

[libs/core.git] / source / core / semaphore.cpp

diff --git a/source/core/semaphore.cpp b/source/core/semaphore.cpp
index 7006eafc51ae5e8c43d938c9f8d04824fbc5e03c..06e8435c3a34212599a8ead8817d28073c4c26cc 100644 (file)
--- a/source/core/semaphore.cpp
+++ b/source/core/semaphore.cpp
@@ -1,35 +1,97 @@
-/*
-This file is part of libmspframework
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
+#ifdef WIN32
+#include <windows.h>
+#else
 #include <sys/time.h>
-#include <errno.h>
+#include <cerrno>
+#endif
+#include <msp/time/rawtime_private.h>
+#include <msp/time/timestamp.h>
+#include <msp/time/units.h>
+#include <msp/time/utils.h>
+#include "mutex_private.h"
 #include "semaphore.h"
-#include "../time/timestamp.h"
-#include "../time/units.h"
-#include "../time/utils.h"
+#include "systemerror.h"
 
 namespace Msp {
 
-int Semaphore::wait(const Time::TimeDelta &d)
+struct Semaphore::Private
+{
+#ifdef WIN32
+       HANDLE handle;
+#else
+       Mutex mutex;
+       pthread_cond_t cond;
+       unsigned limit;
+       unsigned count;
+#endif
+};
+
+
+Semaphore::Semaphore(unsigned limit):
+       priv(new Private)
 {
-#ifndef WIN32
-       Time::TimeStamp ts=Time::now()+d;
-
-       timespec timeout;
-       timeout.tv_sec=ts.raw()/1000000;
-       timeout.tv_nsec=(ts.raw()%1000000)*1000;
-
-       MutexLock l(mutex);
-       int r=pthread_cond_timedwait(&sem, &mutex.mutex, &timeout);
-       if(r==ETIMEDOUT)
-               return 1;
-       else if(r)
-               return -1;
-       return 0;
+#ifdef WIN32
+       priv->handle = CreateSemaphore(0, 0, limit, 0);
 #else
-       return WaitForSingleObject(sem, (DWORD)(d/Time::usec))==WAIT_OBJECT_0;
+       pthread_cond_init(&priv->cond, 0);
+       priv->limit = limit;
+       priv->count = 0;
+#endif
+}
+
+Semaphore::~Semaphore()
+{
+#ifdef WIN32
+       CloseHandle(priv->handle);
+#else
+       pthread_cond_destroy(&priv->cond);
+#endif
+       delete priv;
+}
+
+void Semaphore::signal()
+{
+#ifdef WIN32
+       if(!ReleaseSemaphore(priv->handle, 1, 0))
+               throw system_error("ReleaseSemaphore");
+#else
+       MutexLock mlock(priv->mutex);
+       if(priv->count<priv->limit)
+               ++priv->count;
+       if(int err = pthread_cond_signal(&priv->cond))
+               throw system_error("pthread_cond_signal", err);
+#endif
+}
+
+void Semaphore::wait()
+{ 
+#ifdef WIN32
+       DWORD ret = WaitForSingleObject(priv->handle, INFINITE);
+       if(ret==WAIT_FAILED)
+               throw system_error("WaitForSingleObject");
+#else
+       MutexLock mlock(priv->mutex);
+       while(!priv->count)
+               if(int err = pthread_cond_wait(&priv->cond, &priv->mutex.priv->mutex))
+                       throw system_error("pthread_cond_wait", err);
+       --priv->count;
+#endif
+}
+
+bool Semaphore::wait(const Time::TimeDelta &d)
+{
+#ifdef WIN32
+       DWORD ret = WaitForSingleObject(priv->handle, (DWORD)(d/Time::usec));
+       if(ret==WAIT_FAILED)
+               throw system_error("WaitForSingleObject");
+       return ret==WAIT_OBJECT_0;
+#else
+       timespec timeout = Time::rawtime_to_timespec((Time::now()+d).raw());
+
+       int err = pthread_cond_timedwait(&priv->cond, &priv->mutex.priv->mutex, &timeout);
+       if(err && err!=ETIMEDOUT)
+               throw system_error("pthread_cond_timedwait", err);
+       return err==0;
 #endif
 }