Changeset 238 in flair-src for trunk/lib/FlairCore/src/Semaphore_impl.cpp

Timestamp:

05/15/18 16:41:02 (6 years ago)

Author:

Bayard Gildas

Message:

correction sémaphore. bloquant tout ça...

File:

• trunk/lib/FlairCore/src/Semaphore_impl.cpp (modified) (6 diffs)

trunk/lib/FlairCore/src/Semaphore_impl.cpp

@@ -25 +25 @@
 using namespace flair::core;
 
-Semaphore_impl::Semaphore_impl(Semaphore *self, uint32_t initialValue) {
+Semaphore_impl::Semaphore_impl(Semaphore *self, string name, uint32_t initialValue, Semaphore::Type &type):type(type) {
   this->self = self;
   int status;
@@ -32 +32 @@
   status = rt_sem_create(&semaphore, NULL, initialValue, S_FIFO);
 #else
-  status = sem_init(&semaphore, 0, initialValue);
+  if (type==Semaphore::Type::named) {
+    sem_name = "/" + name;
+    semaphore=sem_open(sem_name.c_str(),O_CREAT, 0666, initialValue);
+    if (semaphore==SEM_FAILED) status=errno; else status=0;
+  } else { //anonymous
+    semaphore=new sem_t;
+    status = sem_init(semaphore, 0, initialValue);
+  }
 #endif
   if (status != 0) {
@@ -46 +53 @@
   status = rt_sem_delete(&semaphore);
 #else
-  status = sem_destroy(&semaphore);
+  if (type==Semaphore::Type::named) {
+    status=sem_close(semaphore);
+    sem_unlink(sem_name.c_str());
+  } else { //anonymous
+    status = sem_destroy(semaphore);
+  }
 #endif
   if (status != 0) {
@@ -58 +70 @@
   return !rt_sem_p(&semaphore, TM_NONBLOCK);
 #else
-  return !sem_trywait(&semaphore);
+  return !sem_trywait(semaphore);
 #endif
 }
@@ -77 +89 @@
         semTimeout.tv_nsec -= 1000000000ULL;
     }
-    status = sem_timedwait(&semaphore, &semTimeout);
+    status = sem_timedwait(semaphore, &semTimeout);
   } else {
-    status = sem_wait(&semaphore);
+    status = sem_wait(semaphore);
   }
 #endif
@@ -102 +114 @@
   status = rt_sem_v(&semaphore);
 #else
-  status = sem_post(&semaphore);
+  status = sem_post(semaphore);
 #endif
   if (status != 0) {