Changeset 203 in flair-src for trunk/lib/FlairCore/src/unexported

Timestamp:

Nov 9, 2017, 2:00:49 PM (7 years ago)

Author:

Bayard Gildas

Message:

Added timeout on SharedMem Read

Location:

trunk/lib/FlairCore/src/unexported

Files:

• Semaphore_impl.h (modified) (1 diff)
• SharedMem_impl.h (modified) (3 diffs)

trunk/lib/FlairCore/src/unexported/Semaphore_impl.h

@@ -31 +31 @@
   Semaphore_impl(flair::core::Semaphore *self, uint32_t initialValue);
   ~Semaphore_impl();
+  bool TryGetSemaphore();
   bool GetSemaphore(flair::core::Time timeout = TIME_INFINITE);
   bool ReleaseSemaphore(void);

trunk/lib/FlairCore/src/unexported/SharedMem_impl.h

@@ -18 +18 @@
 #ifdef __XENO__
 #include <native/heap.h>
-#include <native/mutex.h>
-#else
-#include <semaphore.h>
 #endif
+
+#include <Semaphore.h>
 
 #include <SharedMem.h>
@@ -37 +36 @@
 
   void Write(const char *buf, size_t size);
-  void Read(char *buf, size_t size);
+  bool Read(char *buf, size_t size, flair::core::Time nsTimeout);
   void ReaderReady();
 
@@ -45 +44 @@
   size_t size;
   char *mem_segment;
+  flair::core::Semaphore sem,sem_producer,sem_consumer;
 #ifdef __XENO__
   RT_HEAP heap;
-  RT_MUTEX mutex;
   bool heap_binded;
-  bool mutex_binded;
 #else
   int fd;
-  sem_t *sem,*sem_producer,*sem_consumer;
-  std::string sem_name, shm_name;
-  std::string sem_name_producer,sem_name_consumer;
+  std::string shm_name;
 #endif
 };