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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
maliakal_d
2018-10-11 14:20:58 +02:00
parent 0ee7f67965 f7809bda3b
commit ee20932392
1 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -826,28 +826,18 @@ int slsDetector::receiveModule(sls_detector_module* myMod) {
slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, bool verify) { slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, bool verify) {
auto shm = SharedMemory(multiId, detId);
detectorType type = GENERIC; if (!shm.IsExisting()) {
SharedMemory* shm = 0;
try {
// create
shm = new SharedMemory(multiId, detId);
// shm not created before
if (!shm->IsExisting()) {
cprintf(RED,"Shared memory %s does not exist.\n" cprintf(RED,"Shared memory %s does not exist.\n"
"Corrupted Multi Shared memory. Please free shared memory.\n", "Corrupted Multi Shared memory. Please free shared memory.\n",
shm->GetName().c_str()); shm.GetName().c_str());
throw SharedMemoryException(); throw SharedMemoryException();
} }
// only basic size of structure (just version is required)
sharedSlsDetector* sdet = 0;
size_t sz = sizeof(sharedSlsDetector); size_t sz = sizeof(sharedSlsDetector);
// open, map, verify version // open, map, verify version
sdet = (sharedSlsDetector*)shm->OpenSharedMemory(sz); auto sdet = (sharedSlsDetector*)shm.OpenSharedMemory(sz);
if (verify && sdet->shmversion != SLS_SHMVERSION) { if (verify && sdet->shmversion != SLS_SHMVERSION) {
cprintf(RED, "Single shared memory (%d-%d:)version mismatch " cprintf(RED, "Single shared memory (%d-%d:)version mismatch "
"(expected 0x%x but got 0x%x)\n", "(expected 0x%x but got 0x%x)\n",
@ -858,16 +848,8 @@ slsDetectorDefs::detectorType slsDetector::getDetectorTypeFromShm(int multiId, b
} }
// get type, unmap // get type, unmap
type = sdet->myDetectorType; auto type = sdet->myDetectorType;
shm->UnmapSharedMemory(sdet); shm.UnmapSharedMemory(sdet);
delete shm;
} catch (...) {
if (shm)
delete shm;
throw;
}
return type; return type;
} }