detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-13 23:18:40 +01:00
Code Issues Actions Packages Releases Activity

Dev/verify shm 2 (#1292)

Browse Source 
* userdetails refinedg

* fixed caller test
This commit is contained in:
maliakal_d
2025-09-09 15:35:14 +02:00
committed by GitHub
parent ddc44e1065
commit 028bae82e9
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/src/Detector.cpp
View File

@@ -67,8 +67,13 @@ std::string getUserDetails(const int detectorIndex) {
std::string user = "Unknown";
std::string date = "Unknown";
SharedMemory<sharedDetector> detectorShm(detectorIndex, -1);
if (detectorShm.exists()) {
{
SharedMemory<sharedDetector> detectorShm(detectorIndex, -1);
if (!detectorShm.exists()) {
throw SharedMemoryError("No detector with index " +
std::to_string(detectorIndex) +
" in shared memory!");
}
detectorShm.openSharedMemory(false);
if (detectorShm()->shmversion < DETECTOR_SHMAPIVERSION) {
detectorShm.unmapSharedMemory();
@@ -86,13 +91,16 @@ std::string getUserDetails(const int detectorIndex) {
for (int imod = 0; imod != numModules; ++imod) {
SharedMemory<sharedModule> moduleShm(detectorIndex, imod);
moduleShm.openSharedMemory(false);
if (moduleShm()->shmversion < MODULE_SHMAPIVERSION) {
LOG(logWARNING) << "Module Shared Memory too old to get hostname";
} else {
hostname = moduleShm()->hostname;
if (moduleShm.exists()) {
moduleShm.openSharedMemory(false);
if (moduleShm()->shmversion < MODULE_SHMAPIVERSION) {
LOG(logWARNING)
<< "Module Shared Memory too old to get hostname";
} else {
hostname = moduleShm()->hostname;
}
moduleShm.unmapSharedMemory();
}
moduleShm.unmapSharedMemory();
}
std::ostringstream userDetails;