detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-26 14:11:18 +01:00
Code Issues Actions Packages Releases Activity

Dev/verify shm (#1276)
Some checks failed
Build on RHEL9 / build (push) Failing after 3m41s
Details
Build on RHEL8 / build (push) Failing after 5m10s
Details

Browse Source 
* removed verify, update, fixed getUser to be a free function, generated commands, python bindings yet to do

* python bindings

* fixed tests

* minor

* minor

* format
This commit is contained in:
maliakal_d
2025-08-23 10:23:27 +02:00
committed by GitHub
parent 15cbaa509e
commit fff5fa73be
18 changed files with 198 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
slsDetectorSoftware/src/Module.cpp
View File

@@ -30,27 +30,15 @@
namespace sls {
// creating new shm
Module::Module(detectorType type, int det_id, int module_index, bool verify)
Module::Module(detectorType type, int det_id, int module_index)
: moduleIndex(module_index), shm(det_id, module_index) {
// ensure shared memory was not created before
if (shm.exists()) {
LOG(logWARNING) << "This shared memory should have been "
"deleted before! "
<< shm.getName() << ". Freeing it again";
shm.removeSharedMemory();
}
initSharedMemory(type, det_id, verify);
createSharedMemory(type, det_id);
}
// opening existing shm
Module::Module(int det_id, int module_index, bool verify)
Module::Module(int det_id, int module_index)
: moduleIndex(module_index), shm(det_id, module_index) {
// getDetectorType From shm will check if existing
detectorType type = getDetectorTypeFromShm(det_id, verify);
initSharedMemory(type, det_id, verify);
openSharedMemory(det_id);
}
bool Module::isFixedPatternSharedMemoryCompatible() const {
@@ -3403,43 +3391,39 @@ Ret Module::sendToReceiver(int fnum, const Arg &args) {
return static_cast<const Module &>(*this).sendToReceiver<Ret>(fnum, args);
}
slsDetectorDefs::detectorType Module::getDetectorTypeFromShm(int det_id,
bool verify) {
void Module::createSharedMemory(detectorType type, int det_id) {
shm = SharedMemory<sharedModule>(det_id, moduleIndex);
// ensure shared memory was not created before
if (shm.exists()) {
throw SharedMemoryError(
"This shared memory " + shm.getName() +
" should have been deleted before! Free it to continue.");
}
shm.createSharedMemory();
initializeModuleStructure(type);
}
void Module::openSharedMemory(int det_id) {
shm = SharedMemory<sharedModule>(det_id, moduleIndex);
if (!shm.exists()) {
throw SharedMemoryError("Shared memory " + shm.getName() +
" does not exist.\n Corrupted Multi Shared "
"memory. Please free shared memory.");
}
shm.openSharedMemory(verify);
if (verify && shm()->shmversion != MODULE_SHMVERSION) {
shm.openSharedMemory(true);
if (shm()->shmversion != MODULE_SHMVERSION) {
std::ostringstream ss;
ss << "Single shared memory (" << det_id << "-" << moduleIndex
<< ":)version mismatch (expected 0x" << std::hex << MODULE_SHMVERSION
<< " but got 0x" << shm()->shmversion << ")" << std::dec
<< ". Clear Shared memory to continue.";
ss << "Module shared memory (" << det_id << "-" << moduleIndex
<< ":) version mismatch (expected 0x" << std::hex
<< MODULE_SHMVERSION << " but got 0x" << shm()->shmversion << ")"
<< std::dec << ". Clear Shared memory to continue.";
shm.unmapSharedMemory();
throw SharedMemoryError(ss.str());
}
return shm()->detType;
}
void Module::initSharedMemory(detectorType type, int det_id, bool verify) {
shm = SharedMemory<sharedModule>(det_id, moduleIndex);
if (!shm.exists()) {
shm.createSharedMemory();
initializeModuleStructure(type);
} else {
shm.openSharedMemory(verify);
if (verify && shm()->shmversion != MODULE_SHMVERSION) {
std::ostringstream ss;
ss << "Single shared memory (" << det_id << "-" << moduleIndex
<< ":) version mismatch (expected 0x" << std::hex
<< MODULE_SHMVERSION << " but got 0x" << shm()->shmversion << ")"
<< std::dec << ". Clear Shared memory to continue.";
throw SharedMemoryError(ss.str());
}
}
}
void Module::initializeModuleStructure(detectorType type) {