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

Timestamp:

May 15, 2018, 4:41:02 PM (6 years ago)

Author:

Bayard Gildas

Message:

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

File:

• trunk/lib/FlairCore/src/SharedMem_impl.cpp (modified) (4 diffs)

trunk/lib/FlairCore/src/SharedMem_impl.cpp

@@ -26 +26 @@
 using namespace flair::core;
 
-SharedMem_impl::SharedMem_impl(const SharedMem *self, string name, size_t size, SharedMem::Type &type):self(self),type(type),size(size),
-                               sem(self,1,"/" + name + "_mutex"), sem_producer(self,0,"/" + name + "_producer"),sem_consumer(self,0,"/" + name + "_consumer") {
-
+SharedMem_impl::SharedMem_impl(const SharedMem *self, string name, size_t size, SharedMem::Type &type):self(self),type(type),size(size) {
 #ifdef __XENO__
   heap_binded = false;
@@ -52 +50 @@
 
 #else
+  if (type==SharedMem::Type::mutex) {
+      sem = new Semaphore(self,1,"/" + name + "_mutex",Semaphore::Type::named);
+  } else { //producerConsumer
+      sem_producer=new Semaphore(self,0,"/" + name + "_producer", Semaphore::Type::named);
+      sem_consumer=new Semaphore(self,0,"/" + name + "_consumer", Semaphore::Type::named);
+  }
   shm_name = "/" + name;
   fd = shm_open(shm_name.c_str(), O_RDWR | O_CREAT, 0666);
@@ -100 +104 @@
    }
 */
+    if (type==SharedMem::Type::mutex) {
+      delete sem;
+    } else {
+      delete sem_producer;
+      delete sem_consumer;
+    }
 #endif
 }
 
 void SharedMem_impl::ReaderReady() {
-  sem_consumer.ReleaseSemaphore();
+  if (type==SharedMem::Type::producerConsumer) {
+    sem_consumer->ReleaseSemaphore();
+  } else {
+    self->Warn("Called on a non producerConsumer type of shared memory! (this is seriously wrong)");
+  }
 }
 
 void SharedMem_impl::Write(const char *buf, size_t size) {
   if (type==SharedMem::Type::mutex) {
-    sem.GetSemaphore();
+    sem->GetSemaphore();
     memcpy(mem_segment, buf, size);
-    sem.ReleaseSemaphore();
+    sem->ReleaseSemaphore();
   } else if (type==SharedMem::Type::producerConsumer) {
-    //wait until consumer took the data away before writting a new one
+    //wait until consumer took the data away before writing a new one
     //but should not block if nobody's there to read
-    if (sem_consumer.TryGetSemaphore()) {
+    if (sem_consumer->TryGetSemaphore()) {
       memcpy(mem_segment, buf, size);
-      sem_producer.ReleaseSemaphore();
+      sem_producer->ReleaseSemaphore();
     }
   }
@@ -124 +138 @@
 bool SharedMem_impl::Read(char *buf, size_t size, Time nsTimeout) {
   if (type==SharedMem::Type::mutex) {
-    if (sem.GetSemaphore()) {
+    if (sem->GetSemaphore()) { //may block for ever
       memcpy(buf, mem_segment, size);
-      sem.ReleaseSemaphore();
+      sem->ReleaseSemaphore();
       return true;
     }
   } else if (type==SharedMem::Type::producerConsumer) {
-    if (sem_producer.GetSemaphore(nsTimeout)) {
+    if (sem_producer->GetSemaphore(nsTimeout)) { //if nobody ever writes we need to exit this after a while
       memcpy(buf, mem_segment, size);
-      sem_consumer.ReleaseSemaphore();
+      sem_consumer->ReleaseSemaphore();
       return true;
-    }
+    };
   }
   return false;