adapt to WinCCOA 3.16

cern-hse-computing · Oct 8, 2021 · 7d3d519 · 7d3d519
1 parent f1a5ec9
commit 7d3d519
Show file tree

Hide file tree

Showing 26 changed files with 154 additions and 152 deletions.
diff --git a/REMUS/AsyncRecurringTask.hxx → Common/AsyncRecurringTask.hxx b/REMUS/AsyncRecurringTask.hxx → Common/AsyncRecurringTask.hxx
@@ -28,7 +28,7 @@
  */
 
 
-namespace REMUS
+namespace Common
 {
     template <class Task>
     class AsyncRecurringTask

diff --git a/REMUS/Constants.cxx → Common/Constants.cxx b/REMUS/Constants.cxx → Common/Constants.cxx
@@ -16,7 +16,7 @@
 #include "Logger.hxx"
 #include "Utils.hxx"
 
-namespace REMUS {
+namespace Common {
 
     // Common
     std::string Constants::drv_name = "kafka";
@@ -42,19 +42,22 @@ namespace REMUS {
         {   "DEBUGLVL",
             [](const char* data)
             {
-                REMUS::Logger::setLogLvl((int)*reinterpret_cast<const int32_t*>(data));
+								Common::Logger::globalInfo(Common::Logger::L1, "setLogLvl:", CharString(data));
+                Common::Logger::setLogLvl((int)std::atoi(data));
             }
         },
         {   "DEBOUNCINGTHREADINTERVAL",
             [](const char* data)
             {
-              REMUS::Constants::setDebouncingThreadInterval((int)*reinterpret_cast<const int32_t*>(data));
+							Common::Logger::globalInfo(Common::Logger::L1, "setDebouncingThreadInterval:", CharString(data));
+              Common::Constants::setDebouncingThreadInterval((int)std::atoi(data));
             }
         },
         {   "MAXPOLLRECORDS",
             [](const char* data)
             {
-              REMUS::Constants::setConsumerMaxPollRecords((size_t)*reinterpret_cast<const int32_t*>(data));
+							Common::Logger::globalInfo(Common::Logger::L1, "setConsumerMaxPollRecords:", CharString(data));
+              Common::Constants::setConsumerMaxPollRecords((size_t)std::atoi(data));
             }
         }
 

diff --git a/REMUS/Constants.hxx → Common/Constants.hxx b/REMUS/Constants.hxx → Common/Constants.hxx
@@ -35,10 +35,10 @@
  **/
 
 #include <map>
-#include <REMUS/Utils.hxx>
-#include <REMUS/Logger.hxx>
+#include <Common/Utils.hxx>
+#include <Common/Logger.hxx>
 
-namespace REMUS{
+namespace Common{
 
 /*!
  * \class Constants
@@ -199,15 +199,15 @@ inline void Constants::setProducerKafkaStatsInterval(){
     int milis;
     try
     {
-        if(!REMUS::Utils::convertToInt(REMUS::Constants::GetProducerConfig().at(REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS), milis))
+        if(!Common::Utils::convertToInt(Common::Constants::GetProducerConfig().at(Common::Constants::CONFIG_STATISTICS_INTERVAL_MS), milis))
         {
-            milis = REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
+            milis = Common::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
         }
     }
     catch(std::exception& e)
     {
-        REMUS::Logger::globalWarning(__PRETTY_FUNCTION__," Constants ProducerConfig does not have ", REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS);
-        milis = REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
+        Common::Logger::globalWarning(__PRETTY_FUNCTION__," Constants ProducerConfig does not have ", Common::Constants::CONFIG_STATISTICS_INTERVAL_MS);
+        milis = Common::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
     }
     PRODUCER_KAFKA_STATS_INTERVAL = milis;
 }
@@ -220,15 +220,15 @@ inline void Constants::setConsumerKafkaStatsInterval(){
     int milis;
     try
     {
-        if(!REMUS::Utils::convertToInt(REMUS::Constants::GetConsumerConfig().at(REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS), milis))
+        if(!Common::Utils::convertToInt(Common::Constants::GetConsumerConfig().at(Common::Constants::CONFIG_STATISTICS_INTERVAL_MS), milis))
         {
-            milis = REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
+            milis = Common::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
         }
     }
     catch(std::exception& e)
     {
-        REMUS::Logger::globalWarning(__PRETTY_FUNCTION__," Constants ConsumerConfig does not have ", REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS);
-        milis = REMUS::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
+        Common::Logger::globalWarning(__PRETTY_FUNCTION__," Constants ConsumerConfig does not have ", Common::Constants::CONFIG_STATISTICS_INTERVAL_MS);
+        milis = Common::Constants::CONFIG_STATISTICS_INTERVAL_MS_DEFAULT; // DEFAULT
     }
     CONSUMER_KAFKA_STATS_INTERVAL = milis;
 }

diff --git a/REMUS/Logger.cxx → Common/Logger.cxx b/REMUS/Logger.cxx → Common/Logger.cxx
@@ -13,12 +13,12 @@
  **/
 
 #include "Logger.hxx"
-#include "REMUS/Constants.hxx"
+#include "Common/Constants.hxx"
 #include <mutex>
 
-namespace REMUS {
+namespace Common {
 
-int Logger::loggingLevel = 2;
+int Logger::loggingLevel = 1;
 const char * Logger::timestrformat = "%a, %d.%m.%Y %H:%M:%S";
 
 void Logger::globalInfo(int lvl, const char *note1, const char* note2, const char* note3){

diff --git a/REMUS/Logger.hxx → Common/Logger.hxx b/REMUS/Logger.hxx → Common/Logger.hxx
@@ -26,7 +26,7 @@
 using std::mutex;
 using std::lock_guard;
 
-namespace REMUS {
+namespace Common {
 
 /*!
  * \class Debug

diff --git a/REMUS/Utils.hxx → Common/Utils.hxx b/REMUS/Utils.hxx → Common/Utils.hxx
@@ -33,7 +33,7 @@ std::ostream& operator << (std::ostream& os, const std::vector<T>& iterable)
 }
 
 
-namespace REMUS {
+namespace Common {
 
 using std::future;
 using std::future_status;

diff --git a/Makefile b/Makefile
@@ -25,21 +25,21 @@ define INSTALL_BODY
 	fi;
 endef
 
-REMUS_SOURCE = $(wildcard REMUS/*.cxx)
-REMUS_TYPES = $(REMUS_SOURCE:.cxx=.o)
+COMMON_SOURCE = $(wildcard Common/*.cxx)
+COMMON_TYPES = $(COMMON_SOURCE:.cxx=.o)
 
 TRANSFORMATIONS_SOURCE = $(wildcard Transformations/*.cxx)
 TRANSFORMATIONS = $(TRANSFORMATIONS_SOURCE:.cxx=.o)
 
 
-WCCOAkafkaDrv: $(MYOBJS) $(REMUS_TYPES) $(TRANSFORMATIONS)
+WCCOAkafkaDrv: $(MYOBJS) $(COMMON_TYPES) $(TRANSFORMATIONS)
 	@rm -f addVerInfo.o
 	@$(MAKE) addVerInfo.o
 	$(LINK_CMD) -o $(DRV_NAME) *.o $(OBJS) $(LIBS)
 
 
 installLibs:
-	sudo yum install --assumeyes cyrus-sasl-gssapi boost* cmake openssl-devel 
+	sudo yum install --assumeyes cyrus-sasl-gssapi cyrus-sasl-devel boost* cmake openssl-devel
 	git submodule update --init --recursive
 	cd ./libs/librdkafka && ./configure && make && sudo make install
 	cd ./libs/cppkafka && mkdir -p build && cd build && cmake .. && make && sudo make install

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-CERN HSE Computing  (HSE-CEN-CO)
+CERN HSE Computing  (HSE-TS-CS)
 ==================================================
 
 Contact email: [email protected]
 
-REMUS WinCC OA Kafka Driver
+WinCC OA Kafka Driver
 ==================================================
 
 

diff --git a/Transformations/kafkaBoolTrans.cxx b/Transformations/kafkaBoolTrans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 
@@ -84,7 +84,7 @@ VariablePtr kafkaBoolTrans::toVar(const PVSSchar *buffer, const PVSSuint dlen, c
             return new BitVar(true);
         else
         {
-            REMUS::Logger::globalWarning(__PRETTY_FUNCTION__, "Unable to parse boolean for buffer:", (const char*)buffer);
+            Common::Logger::globalWarning(__PRETTY_FUNCTION__, "Unable to parse boolean for buffer:", (const char*)buffer);
         }
     }
     return NULL;

diff --git a/Transformations/kafkaFloatTrans.cxx b/Transformations/kafkaFloatTrans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 
@@ -82,7 +82,7 @@ VariablePtr kafkaFloatTrans::toVar(const PVSSchar *buffer, const PVSSuint dlen,
         }
         catch(std::exception& e)
         {
-            REMUS::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
+            Common::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
         }
     }
 

diff --git a/Transformations/kafkaInt32Trans.cxx b/Transformations/kafkaInt32Trans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 
@@ -82,7 +82,7 @@ VariablePtr kafkaInt32Trans::toVar(const PVSSchar *buffer, const PVSSuint dlen,
         }
         catch(std::exception& e)
         {
-            REMUS::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
+            Common::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
         }
     }
 

diff --git a/Transformations/kafkaInt64Trans.cxx b/Transformations/kafkaInt64Trans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 
@@ -82,7 +82,7 @@ VariablePtr kafkaInt64Trans::toVar(const PVSSchar *buffer, const PVSSuint dlen,
         }
         catch(std::exception& e)
         {
-            REMUS::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
+            Common::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
         }
     }
     return NULL;

diff --git a/Transformations/kafkaStringTrans.cxx b/Transformations/kafkaStringTrans.cxx
@@ -19,7 +19,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 //----------------------------------------------------------------------------
 namespace Transformations {

diff --git a/Transformations/kafkaTimeTrans.cxx b/Transformations/kafkaTimeTrans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 

diff --git a/Transformations/kafkaUint8Trans.cxx b/Transformations/kafkaUint8Trans.cxx
@@ -16,7 +16,7 @@
 
 #include "kafkaHWMapper.hxx"
 
-#include "REMUS/Logger.hxx"
+#include "Common/Logger.hxx"
 
 #include <cmath>
 
@@ -85,7 +85,7 @@ VariablePtr kafkaUint8Trans::toVar(const PVSSchar *buffer, const PVSSuint dlen,
         }
         catch(std::exception& e)
         {
-            REMUS::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
+            Common::Logger::globalWarning(__PRETTY_FUNCTION__, e.what());
         }
 
     }

diff --git a/addVerInfo.cxx b/addVerInfo.cxx
@@ -22,9 +22,9 @@
 
 #define SET_VERSINFO(vi) \
     vi[0] = version[0]; /* warning-suppression: "version unused ..." */ \
-    sprintf(vi, "%s %s platform %s linked at %s", \
+    sprintf(vi, "%s %s linked at %s", \
     PVSS_VERSION " " PVSS_VERS_COMMENT PVSS_VERS_WARNING, \
-    PVSS_PATCH, PVSS_PLATFORM, __DATE__ " " __TIME__);
+    PVSS_PATCH, __DATE__ " " __TIME__);
 
 
 #ifndef ADDVERINFO

diff --git a/kafkaConsumerFacade.cxx b/kafkaConsumerFacade.cxx
@@ -15,8 +15,8 @@
 #include <csignal>
 
 #include "kafkaConsumerFacade.hxx"
-#include "REMUS/Constants.hxx"
-#include "REMUS/Logger.hxx"
+#include "Common/Constants.hxx"
+#include "Common/Logger.hxx"
 
 #include "cppkafka/message.h"
 #include "cppkafka/kafka_handle_base.h"
@@ -43,7 +43,7 @@ kafkaConsumerFacade::kafkaConsumerFacade(const std::string& topic, consumeCallba
     try{
         //Create kafka configuration
         Configuration config;
-        for (const auto & kv : REMUS::Constants::GetConsumerConfig())
+        for (const auto & kv : Common::Constants::GetConsumerConfig())
         {
             std::cerr << kv.first << " - "<< kv.second << std::endl;
             config.set(kv.first, kv.second);
@@ -52,12 +52,12 @@ kafkaConsumerFacade::kafkaConsumerFacade(const std::string& topic, consumeCallba
         //Update consumer group id to be unique by appending topic and current timestamp
         try
         {
-            config.set(REMUS::Constants::GROUP_ID_KEYWORD, config.get(REMUS::Constants::GROUP_ID_KEYWORD) + "_" + topic  + "_" + std::to_string(std::chrono::seconds(std::time(NULL)).count()));
+            config.set(Common::Constants::GROUP_ID_KEYWORD, config.get(Common::Constants::GROUP_ID_KEYWORD) + "_" + topic  + "_" + std::to_string(std::chrono::seconds(std::time(NULL)).count()));
         }
         catch (ConfigOptionNotFound& e)
         {
-             REMUS::Logger::globalWarning("No group id found! Adding default one: topicname_unixtimestamp", e.what());
-             config.set(REMUS::Constants::GROUP_ID_KEYWORD, topic + "_" + std::to_string(std::chrono::seconds(std::time(NULL)).count()));
+             Common::Logger::globalWarning("No group id found! Adding default one: topicname_unixtimestamp", e.what());
+             config.set(Common::Constants::GROUP_ID_KEYWORD, topic + "_" + std::to_string(std::chrono::seconds(std::time(NULL)).count()));
         }
 
         // set the error and statistics callbacks on the kafka config
@@ -80,13 +80,13 @@ kafkaConsumerFacade::kafkaConsumerFacade(const std::string& topic, consumeCallba
     }
     catch(std::exception& e)
     {
-        REMUS::Logger::globalWarning("Unable to initialize consumer!", e.what());
+        Common::Logger::globalWarning("Unable to initialize consumer!", e.what());
     }
 }
 
 void kafkaConsumerFacade::poll(const size_t& maxPollRecords)
 {
-    REMUS::Logger::globalInfo(REMUS::Logger::L2, __PRETTY_FUNCTION__, "Poll batch with maxPollRecords:", CharString(maxPollRecords));
+    Common::Logger::globalInfo(Common::Logger::L2, __PRETTY_FUNCTION__, "Poll batch with maxPollRecords:", CharString(maxPollRecords));
     std::vector<Message> msgVec = std::move(_consumer->poll_batch(maxPollRecords));
     for (auto & msg : msgVec )
     {

diff --git a/kafkaDrv.files b/kafkaDrv.files
@@ -22,17 +22,17 @@ Transformations/kafkaTimeTrans.cxx
 Transformations/kafkaTimeTrans.hxx
 Transformations/kafkaUint8Trans.cxx
 Transformations/kafkaUint8Trans.hxx
-REMUS/Logger.cxx
-REMUS/Logger.hxx
-REMUS/Constants.hxx
-REMUS/Constants.cxx
-REMUS/Utils.hxx
+Common/Logger.cxx
+Common/Logger.hxx
+Common/Constants.hxx
+Common/Constants.cxx
+Common/Utils.hxx
 LICENSE
 Makefile
 kafkaProducerFacade.hxx
 kafkaProducerFacade.cxx
-REMUS/Utils.hxx
-REMUS/AsyncRecurringTask.hxx
+Common/Utils.hxx
+Common/AsyncRecurringTask.hxx
 kafkaConsumerFacade.cxx
 kafkaConsumerFacade.hxx
 LICENSE

diff --git a/kafkaDrv.includes b/kafkaDrv.includes
@@ -1,13 +1,13 @@
-/opt/WinCC_OA/3.15/api/include/Basics/Variables/
-/opt/WinCC_OA/3.15/api/include/Basics/Utilities
-/opt/WinCC_OA/3.15/api/include/Basics/DpBasics
-/opt/WinCC_OA/3.15/api/include/Basics/NoPosix
-/opt/WinCC_OA/3.15/api/include/ComDrv/
-/opt/WinCC_OA/3.15/api/include/Configs/DrvConfigs/DrvCommon/
-/opt/WinCC_OA/3.15/api/include/PVSSUtil
-/opt/WinCC_OA/3.15/api/include/Configs
-/opt/WinCC_OA/3.15/api/include/Configs/DrvConfigs
-/opt/WinCC_OA/3.15/api/include/Ctrl
-/opt/WinCC_OA/3.15/api/include/Datapoint
+/opt/WinCC_OA/3.16/api/include/Basics/Variables/
+/opt/WinCC_OA/3.16/api/include/Basics/Utilities
+/opt/WinCC_OA/3.16/api/include/Basics/DpBasics
+/opt/WinCC_OA/3.16/api/include/Basics/NoPosix
+/opt/WinCC_OA/3.16/api/include/ComDrv/
+/opt/WinCC_OA/3.16/api/include/Configs/DrvConfigs/DrvCommon/
+/opt/WinCC_OA/3.16/api/include/PVSSUtil
+/opt/WinCC_OA/3.16/api/include/Configs
+/opt/WinCC_OA/3.16/api/include/Configs/DrvConfigs
+/opt/WinCC_OA/3.16/api/include/Ctrl
+/opt/WinCC_OA/3.16/api/include/Datapoint
 .
-REMUS
+Common