From b4ddb3b9b68dabaa6c4df7fa3fe61398f19cc870 Mon Sep 17 00:00:00 2001
From: Alice <alice.mazzoleni@psi.ch>
Date: Fri, 29 May 2026 17:45:23 +0200
Subject: [PATCH] add error log when opening dev/mem

---
 slsDetectorServers/matterhornServer/src/MatterhornApp.cpp   | 2 ++
 .../slsDetectorServer_cpp/src/MemoryModel.cpp               | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp b/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
index d41fe9157..c97a10354 100644
--- a/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
+++ b/slsDetectorServers/matterhornServer/src/MatterhornApp.cpp
@@ -80,6 +80,7 @@ int main(int argc, char *argv[]) {
                 pause(); // wait for signal to exit
             }
         } catch (...) {
+            LOG(logERROR) << "Some Error occured in Stop Server, exiting";
             kill(getppid(), SIGINT); // tell parent to exit // TODO: should then
                                      // also return EXIT_FAILURE
         }
@@ -100,6 +101,7 @@ int main(int argc, char *argv[]) {
                 pause(); // wait for signal to exit
             }
         } catch (...) {
+            LOG(logERROR) << "Some Error occured in Control Server, exiting";
             LOG(sls::logINFOBLUE)
                 << "Exiting Control Server [ Tid: " << gettid() << " ]";
             LOG(sls::logINFO) << "Exiting Detector Server";
diff --git a/slsDetectorServers/slsDetectorServer_cpp/src/MemoryModel.cpp b/slsDetectorServers/slsDetectorServer_cpp/src/MemoryModel.cpp
index d9aca863f..654bf46b1 100644
--- a/slsDetectorServers/slsDetectorServer_cpp/src/MemoryModel.cpp
+++ b/slsDetectorServers/slsDetectorServer_cpp/src/MemoryModel.cpp
@@ -18,6 +18,7 @@ void HardwareMemoryModel::mapToMemory() {
     int fd = open("/dev/mem", O_RDWR | O_SYNC, 0);
 
     if (fd == -1) {
+        LOG(logERROR) << "Can't open /dev/mem: " << strerror(errno);
         throw std::runtime_error("Can't find /dev/mem");
     }
 
@@ -52,6 +53,9 @@ void HardwareMemoryModel::unmapMemory() {
     }
 }
 
-HardwareMemoryModel::~HardwareMemoryModel() { unmapMemory(); }
+HardwareMemoryModel::~HardwareMemoryModel() {
+    LOG(logDEBUG1) << "HardwareMemoryModel destructor called, unmapping memory";
+    unmapMemory();
+}
 
 } // namespace sls
\ No newline at end of file