From f1e22a2e516d201c58edc2552db5086dd19e2b69 Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Wed, 29 Jan 2020 10:45:55 +0100
Subject: [PATCH] Fixed bug in testable mode and device initalisation
- Exception handling decorator does not allow to leave testable mode before
devices are up
- Test facility makes sure that testable mode counter is zero at the end of startApplication()
---
include/Application.h | 3 +++
include/TestFacility.h | 8 ++++++++
src/ExceptionHandlingDecorator.cc | 13 +++++++++++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/include/Application.h b/include/Application.h
index d3c35ef5..35f91eb9 100644
--- a/include/Application.h
+++ b/include/Application.h
@@ -211,6 +211,9 @@ namespace ChimeraTK {
template<typename UserType>
friend class Accessor;
+ template<typename UserType>
+ friend class ExceptionHandlingDecorator;
+
/** Finalise connections, i.e. decide still-undecided details mostly for
* Device and ControlSystem variables */
void finaliseNetworks();
diff --git a/include/TestFacility.h b/include/TestFacility.h
index ba515173..c03ba20b 100644
--- a/include/TestFacility.h
+++ b/include/TestFacility.h
@@ -65,6 +65,14 @@ namespace ChimeraTK {
if(allOpened) break;
}
Application::testableModeLock("waitDevicesToOpen");
+ // make sure all initial values have been propagated when in testable mode
+ if(Application::getInstance().isTestableModeEnabled()) {
+ // call stepApplication() only in testable mode and only if the queues are not empty
+ if(Application::getInstance().testableMode_counter != 0) {
+ stepApplication();
+ }
+ }
+
// receive all initial values for the control system variables
if(Application::getInstance().isTestableModeEnabled()) {
for(auto& pv : pvManager->getAllProcessVariables()) {
diff --git a/src/ExceptionHandlingDecorator.cc b/src/ExceptionHandlingDecorator.cc
index 92b1ae29..d8d9d45a 100644
--- a/src/ExceptionHandlingDecorator.cc
+++ b/src/ExceptionHandlingDecorator.cc
@@ -58,9 +58,18 @@ namespace ChimeraTK {
deviceModule.writeAfterOpen.push_back(this->_recoveryAccessor);
return false;
}
- Application::getInstance().testableModeUnlock("waitForDeviceOpen");
+ // We artificially increase the testabel mode counter so the test does not slip out of testable mode here in case
+ // the queues are empty. At the moment, the exception handling has to be done before you get the lock back in your test.
+ // Exception handling cannot be tested in testable mode at the moment.
+ if(Application::getInstance().isTestableModeEnabled()) {
+ ++Application::getInstance().testableMode_counter;
+ Application::getInstance().testableModeUnlock("waitForDeviceOpen");
+ }
boost::this_thread::sleep(boost::posix_time::millisec(DeviceOpenTimeout));
- Application::getInstance().testableModeLock("waitForDeviceOpen");
+ if(Application::getInstance().isTestableModeEnabled()) {
+ Application::getInstance().testableModeLock("waitForDeviceOpen");
+ --Application::getInstance().testableMode_counter;
+ }
continue;
}
auto retval = callable();
--
GitLab