Changeset 126 in flair-src for trunk/lib/FlairCore

Timestamp:

01/17/17 10:47:02 (7 years ago)

Author:

Thomas Fuhrmann

Message:

Add timed semaphore and bool return

Location:

trunk/lib/FlairCore/src

Files:

• Semaphore.cpp (modified) (1 diff)
• Semaphore.h (modified) (2 diffs)
• Semaphore_impl.cpp (modified) (3 diffs)

trunk/lib/FlairCore/src/Semaphore.cpp

@@ -31 +31 @@
 Semaphore::~Semaphore() { delete pimpl_; }
 
-void Semaphore::GetSemaphore(void) const { pimpl_->GetSemaphore(); }
+bool Semaphore::GetSemaphore(Time timeout) const { return pimpl_->GetSemaphore(timeout); }
 
-void Semaphore::ReleaseSemaphore(void) const { pimpl_->ReleaseSemaphore(); }
+bool Semaphore::ReleaseSemaphore(void) const { return pimpl_->ReleaseSemaphore(); }
 
 } // end namespace core

trunk/lib/FlairCore/src/Semaphore.h

@@ -51 +51 @@
   *
   * Lock the semaphore.
-  *
+  * 
+  * \param timeout The timeout, in nanoseconds.
   */
-  void GetSemaphore(void) const;
+  bool GetSemaphore(Time timeout = TIME_INFINITE) const;
 
   /*!
@@ -61 +62 @@
   *
   */
-  void ReleaseSemaphore(void) const;
+  bool ReleaseSemaphore(void) const;
 
 private:

trunk/lib/FlairCore/src/Semaphore_impl.cpp

@@ -20 +20 @@
 
 #include <string.h>
+#include <time.h>
 
 using std::string;
@@ -48 +49 @@
 }
 
-void Semaphore_impl::GetSemaphore(void) {
+bool Semaphore_impl::GetSemaphore(Time timeout) {
   int status;
+  bool returnValue = true;
 #ifdef __XENO__
-  status = rt_sem_p(&semaphore, TM_INFINITE);
+  status = rt_sem_p(&semaphore, timeout);
 #else
-  status = sem_wait(&semaphore);
+  if (timeout != 0) {
+    struct timespec semTimeout;
+    clock_gettime(CLOCK_REALTIME, &semTimeout);
+    semTimeout.tv_sec += timeout / 1000000000ULL;
+    semTimeout.tv_nsec += timeout % 1000000000ULL;
+    if (semTimeout.tv_nsec >= 1000000000ULL) {
+        semTimeout.tv_sec++;
+        semTimeout.tv_nsec -= 1000000000ULL;
+    }
+    status = sem_timedwait(&semaphore, &semTimeout);
+  } else {
+    status = sem_wait(&semaphore);
+  }
 #endif
-  if (status != 0)
-    self->Err("error getting the semaphore (%s)\n", strerror(-status));
+        if (status != 0) {
+                if (errno == ETIMEDOUT) {
+                        self->Warn("warning : semaphore timedout\n");   
+                } else {
+                    self->Err("error getting the semaphore (%s)\n", strerror(-status));
+                }
+    returnValue = false;
+  }
+  return returnValue;
 }
 
-void Semaphore_impl::ReleaseSemaphore(void) {
+bool Semaphore_impl::ReleaseSemaphore(void) {
   int status;
+  bool returnValue = true;
 #ifdef __XENO__
   status = rt_sem_v(&semaphore);
@@ -66 +88 @@
   status = sem_post(&semaphore);
 #endif
-  if (status != 0)
+  if (status != 0) {
     self->Err("error releasing the semaphore (%s)\n", strerror(-status));
+    returnValue = false;
+  }
+  return returnValue;
 }