Changeset 330 in flair-src for trunk/lib/FlairCore/src/ConditionVariable_impl.cpp

Timestamp:

09/25/19 15:29:26 (5 years ago)

Author:

Sanahuja Guillaume

Message:

use less bandwidth in vprnlite

File:

• trunk/lib/FlairCore/src/ConditionVariable_impl.cpp (modified) (2 diffs)

trunk/lib/FlairCore/src/ConditionVariable_impl.cpp

@@ -53 +53 @@
 }
 
-void ConditionVariable_impl::CondWait(void) {
+bool ConditionVariable_impl::CondWait(Time timeout) {
   int status;
+  if(timeout==TIME_INFINITE) {
 #ifdef __XENO__
-  status =
-      rt_cond_wait(&m_ResumeCond, &self->Mutex::pimpl_->mutex, TM_INFINITE);
+    status=rt_cond_wait(&m_ResumeCond, &self->Mutex::pimpl_->mutex, TM_INFINITE);
 #else
-  status = pthread_cond_wait(&m_ResumeCond, &self->Mutex::pimpl_->mutex);
+    status=pthread_cond_wait(&m_ResumeCond, &self->Mutex::pimpl_->mutex);
 #endif
-  if (status != 0) {
-                char errorMsg[256];
-    self->Err("error (%s)\n", strerror_r(-status, errorMsg, sizeof(errorMsg)));
-        }
+    if(status != 0) {
+      char errorMsg[256];
+      self->Err("error (%s)\n", strerror_r(-status, errorMsg, sizeof(errorMsg)));
+      return false;
+    }
+    return true;
+  } else {
+    return CondWaitUntil(GetTime()+timeout);
+  }
 }
 
@@ -72 +77 @@
   status = rt_cond_wait_until(&m_ResumeCond, &self->Mutex::pimpl_->mutex, date);
 #else
-  struct timespec restrict;
-  restrict.tv_sec = date / 1000000000;
-  restrict.tv_nsec = date % 1000000000;
+  struct timespec abstime;
+  abstime.tv_sec = date / 1000000000;
+  abstime.tv_nsec = date % 1000000000;
   status = pthread_cond_timedwait(&m_ResumeCond, &self->Mutex::pimpl_->mutex,
-                                  &restrict);
+                                  &abstime);
 #endif
-  if (status == 0)
-    return true;
+  if (status == 0) return true;
   if (status != ETIMEDOUT) {
                 char errorMsg[256];