detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 16:08:38 +01:00
Code Issues Actions Packages Releases Activity

slsDetectorSoftware: Sharedmemory removed private methodf or removeshm, removed static isexisting as the usecases are all member method

Browse Source
This commit is contained in:
maliakal_d
2018-07-06 15:18:34 +02:00
parent 7c29327b47
commit ecd0c810ca
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -621,8 +621,8 @@ void multiSlsDetector::freeSharedMemory(int multiId) {
int numDetectors = 0;
SharedMemory* shm = new SharedMemory(multiId, -1);
// shm not created before
if (SharedMemory::IsExisting(shm->GetName())) {
// get number of detectors from multi shm
if (shm->IsExisting()) {
sharedMultiSlsDetector* mdet = (sharedMultiSlsDetector*)shm->OpenSharedMemory(
sizeof(sharedMultiSlsDetector));
numDetectors = mdet->numberOfDetectors;
@@ -715,7 +715,7 @@ bool multiSlsDetector::initSharedMemory(bool verify) {
bool created = false;
sharedMemory = new SharedMemory(detId, -1);
if (SharedMemory::IsExisting(sharedMemory->GetName())) {
if (sharedMemory->IsExisting()) {
thisMultiDetector = (sharedMultiSlsDetector*)sharedMemory->OpenSharedMemory(sz);
if (verify && thisMultiDetector->shmversion != MULTI_SHMVERSION) {
cprintf(RED, "Multi shared memory (%d) version mismatch "