detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-14 05:47:14 +02:00
Code Issues Actions Packages Releases Activity

slsDetectorSoftware: updated shared memory to have _sls_ instead of _single_, and updated versions

Browse Source
This commit is contained in:
maliakal_d
2018-06-28 10:37:46 +02:00
parent 73ac8bab38
commit f6660c0dac
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/sharedMemory/SharedMemory.cpp
View File

@ -13,11 +13,11 @@
#include <sstream>
SharedMemory::SharedMemory(int multiId, int singleId):
SharedMemory::SharedMemory(int multiId, int slsId):
fd(-1),
shmSize(0)
{
name = ConstructSharedMemoryName(multiId, singleId);
name = ConstructSharedMemoryName(multiId, slsId);
}
@ -105,12 +105,12 @@ void* SharedMemory::MapSharedMemory(size_t sz) {
}
std::string SharedMemory::ConstructSharedMemoryName(int multiId, int singleId) {
std::string SharedMemory::ConstructSharedMemoryName(int multiId, int slsId) {
stringstream ss;
if (singleId < 0)
if (slsId < 0)
ss << "/slsDetectorPackage_multi_" << multiId;
else
ss << "/slsDetectorPackage_multi_" << multiId << "_single_" << singleId;
ss << "/slsDetectorPackage_multi_" << multiId << "_sls_" << slsId;
std::string temp = ss.str();
if (temp.length() > NAME_MAX) {