Changeset 350 in pacpusframework for trunk/src

Timestamp:

Oct 15, 2015, 2:40:14 PM (9 years ago)

Author:

nguyenhu

Message:

add Zoe types and shared memory for linux

Location:

trunk/src/PacpusTools

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/PosixShMem.cpp (modified) (1 diff)

trunk/src/PacpusTools/CMakeLists.txt

@@ -36 +36 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/SharedMemory.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
 
     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
@@ -48 +49 @@
     #src/PacpusSerialPort.cpp
     src/SharedMemory.cpp
+    src/PosixShMem.cpp
 )
 

trunk/src/PacpusTools/src/PosixShMem.cpp

@@ -104 +104 @@
 
 //////////////////////////////////////////////////////////////////////////
-/// Use this method to get the data of the shared memory
+/// Use this method to get a pointer to data of the shared memory
 void * PosixShMem::read()
 {
-    return shMem_;
+    void * shMem;
+    lockMemory();
+    shMem = shMem_;
+    unlockMemory();
+    return shMem;
+}
+
+//////////////////////////////////////////////////////////////////////////
+/// Use this method to get a pointer to data of the shared memory
+void PosixShMem::read(void * mem, int size)
+{
+    lockMemory();
+    memcpy(mem,shMem_,size);
+    unlockMemory();
 }