detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 15:57:13 +02: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

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -46,7 +46,7 @@ slsDetector::slsDetector(detectorType type, int multiId, int id, bool verify, mu
// ensure shared memory was not created before
SharedMemory* shm = new SharedMemory(multiId, id);
if (SharedMemory::IsExisting(shm->GetName())) {
if (shm->IsExisting()) {
cprintf(YELLOW BOLD,"Warning: Weird, this shared memory should have been "
"deleted before! %s. Freeing it again.\n", shm->GetName().c_str());
freeSharedMemory(multiId, id);
@ -1250,7 +1250,7 @@ int slsDetector::receiveModule(sls_detector_module* myMod) {
slsReceiverDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, bool verify) {
SharedMemory* shm = new SharedMemory(multiId, detId);
// shm not created before
if (!SharedMemory::IsExisting(shm->GetName())) {
if (!shm->IsExisting()) {
cprintf(RED,"Shared memory %s does not exist.\n"
"Corrupted Multi Shared memory. Please free shared memory.\n",
shm->GetName().c_str());