From a9933d0e6a338a026443f99d75b75df4eccc937d Mon Sep 17 00:00:00 2001
From: Jens Georg <jens.georg@desy.de>
Date: Thu, 4 Jun 2020 16:47:57 +0200
Subject: [PATCH] Set object_name before the call to eq_server
---
src/eq_create.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/eq_create.cc b/src/eq_create.cc
index bfdc25e..720e5ea 100644
--- a/src/eq_create.cc
+++ b/src/eq_create.cc
@@ -10,12 +10,18 @@ static char const* XML_CONFIG_SUFFIX = "-DoocsVariableConfig.xml";
static ChimeraTK::DoocsAdapter doocsAdapter;
+extern int eq_server(int, char**);
+
+int main(int argc, char* argv[]) {
+ object_name = ChimeraTK::ApplicationBase::getInstance().getName().c_str();
+ return eq_server(argc, argv);
+}
+
/* eq_init_prolog is called before the locations are created, i.e. before the
* first call to eq_create. We initialise the application, i.e. all process
* variables are created in this function. */
void eq_init_prolog() {
// set the DOOCS server name to the application name
- object_name = ChimeraTK::ApplicationBase::getInstance().getName().c_str();
// Create static instances for all applications cores. They must not have
// overlapping process variable names ("location/protery" must be unique).
ChimeraTK::ApplicationBase::getInstance().setPVManager(doocsAdapter.getDevicePVManager());
--
GitLab