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

size of shm needs to be only sometimes checked when opening shared memory (#443)

Browse Source
This commit is contained in:
Dhanya Thattil
2022-05-16 12:27:48 +02:00
committed by GitHub
parent 88649a00b6
commit 8d6b8d66cc
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -47,7 +47,7 @@ void DetectorImpl::setupDetector(bool verify, bool update) {
}
if (ctb_shm.exists())
ctb_shm.openSharedMemory();
ctb_shm.openSharedMemory(verify);
}
void DetectorImpl::setAcquiringFlag(bool flag) { shm()->acquiringFlag = flag; }
@ -69,7 +69,7 @@ void DetectorImpl::freeSharedMemory(int detectorIndex, int detPos) {
int numModules = 0;
if (detectorShm.exists()) {
detectorShm.openSharedMemory();
detectorShm.openSharedMemory(false);
numModules = detectorShm()->numberOfModules;
detectorShm.removeSharedMemory();
}
@ -144,7 +144,7 @@ void DetectorImpl::initSharedMemory(bool verify) {
shm.createSharedMemory();
initializeDetectorStructure();
} else {
shm.openSharedMemory();
shm.openSharedMemory(verify);
if (verify && shm()->shmversion != DETECTOR_SHMVERSION) {
LOG(logERROR) << "Detector shared memory (" << detectorIndex
<< ") version mismatch "
@ -264,7 +264,7 @@ void DetectorImpl::setHostname(const std::vector<std::string> &name) {
if (shm()->detType == defs::CHIPTESTBOARD) {
if (ctb_shm.exists())
ctb_shm.openSharedMemory();
ctb_shm.openSharedMemory(true);
else
ctb_shm.createSharedMemory();
}