Merge pull request #73 from DUNE-DAQ/feature/opmon

Feature/opmon

CMakeLists.txt

@@ -13,9 +13,8 @@ find_package(confmodel REQUIRED)
 
 daq_oks_codegen(listrev.schema.xml NAMESPACE dunedaq::listrev::dal DALDIR dal DEP_PKGS confmodel)
 
-
 daq_codegen( listreverser.jsonnet randomdatalistgenerator.jsonnet reversedlistvalidator.jsonnet TEMPLATES Structs.hpp.j2 Nljs.hpp.j2)
-daq_codegen( listreverserinfo.jsonnet randomdatalistgeneratorinfo.jsonnet reversedlistvalidatorinfo.jsonnet DEP_PKGS opmonlib TEMPLATES opmonlib/InfoStructs.hpp.j2 opmonlib/InfoNljs.hpp.j2 )
+daq_protobuf_codegen( opmon/*.proto )
 
 daq_add_library(ListCreator.cpp ListStorage.cpp LINK_LIBRARIES  appfwk::appfwk confmodel::confmodel)
 

plugins/ListReverser.cpp

@@ -11,7 +11,7 @@
 #include "listrev/dal/RandomDataListGenerator.hpp"
 #include "listrev/dal/RandomListGeneratorSet.hpp"
 
-#include "listrev/listreverserinfo/InfoNljs.hpp"
+#include "listrev/opmon/list_rev_info.pb.h"
 
 #include "CommonIssues.hpp"
 #include "ListReverser.hpp"
@@ -88,19 +88,20 @@ ListReverser::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
 }
 
 void
-ListReverser::get_info(opmonlib::InfoCollector& ci, int /*level*/)
+ListReverser::generate_opmon_data()
 {
-  listreverserinfo::Info fcr;
-
-  fcr.requests_received = m_requests_received.exchange(0);
-  fcr.requests_sent = m_requests_sent.exchange(0);
-  fcr.lists_received = m_lists_received.exchange(0);
-  fcr.lists_sent = m_lists_sent.exchange(0);
-  fcr.total_requests_received = m_total_requests_received.load();
-  fcr.total_requests_sent = m_total_requests_sent.load();
-  fcr.total_lists_received = m_total_lists_received.load();
-  fcr.total_lists_sent = m_total_lists_sent.load();
-  ci.add(fcr);
+  opmon::ListReverserInfo fcr;
+
+  fcr.set_requests_received(m_requests_received.exchange(0));
+  fcr.set_requests_sent(m_requests_sent.exchange(0));
+  fcr.set_lists_received(m_lists_received.exchange(0));
+  fcr.set_lists_sent(m_lists_sent.exchange(0));
+  fcr.set_total_requests_received(m_total_requests_received.load());
+  fcr.set_total_requests_sent(m_total_requests_sent.load());
+  fcr.set_total_lists_received(m_total_lists_received.load());
+  fcr.set_total_lists_sent(m_total_lists_sent.load());
+
+  publish(std::move(fcr));
 }
 
 void

plugins/ListReverser.hpp

@@ -50,7 +50,9 @@ class ListReverser : public dunedaq::appfwk::DAQModule
   ListReverser& operator=(ListReverser&&) = delete;      ///< ListReverser is not move-assignable
 
   void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
-  void get_info(opmonlib::InfoCollector& ci, int level) override;
+
+protected:
+  void generate_opmon_data() override;
 
 private:
   // Commands

plugins/RandomDataListGenerator.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "listrev/dal/RandomDataListGenerator.hpp"
-#include "listrev/randomdatalistgeneratorinfo/InfoNljs.hpp"
+#include "listrev/opmon/list_rev_info.pb.h"
 
 #include "CommonIssues.hpp"
 #include "RandomDataListGenerator.hpp"
@@ -82,15 +82,16 @@ RandomDataListGenerator::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
 }
 
 void
-RandomDataListGenerator::get_info(opmonlib::InfoCollector& ci, int /*level*/)
+RandomDataListGenerator::generate_opmon_data()
 {
-  randomdatalistgeneratorinfo::Info fcr;
+  opmon::RandomListGeneratorInfo fcr;
 
-  fcr.generated_numbers = m_generated_tot.load();
-  fcr.new_generated_numbers = m_generated.exchange(0);
-  fcr.sent_lists = m_sent_tot.load();
-  fcr.new_sent_lists = m_sent.exchange(0);
-  ci.add(fcr);
+  fcr.set_generated_numbers(m_generated_tot.load());
+  fcr.set_new_generated_numbers(m_generated.exchange(0));
+  fcr.set_lists_sent(m_sent_tot.load());
+  fcr.set_new_lists_sent(m_sent.exchange(0));
+
+  publish( std::move(fcr) );
 }
 
 void

plugins/RandomDataListGenerator.hpp

@@ -52,7 +52,9 @@ class RandomDataListGenerator : public dunedaq::appfwk::DAQModule
     delete; ///< RandomDataListGenerator is not move-assignable
 
   void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
-  void get_info(opmonlib::InfoCollector& ci, int level) override;
+
+protected:
+  void generate_opmon_data() override;
 
 private:
   // Commands

plugins/ReversedListValidator.cpp

@@ -8,7 +8,7 @@
  */
 #include <string>
 
-#include "listrev/reversedlistvalidatorinfo/InfoNljs.hpp"
+#include "listrev/opmon/list_rev_info.pb.h"
 #include "listrev/dal/ReversedListValidator.hpp"
 #include "listrev/dal/RandomDataListGenerator.hpp"
 #include "listrev/dal/RandomListGeneratorSet.hpp"
@@ -93,19 +93,20 @@ ReversedListValidator::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
 }
 
 void
-ReversedListValidator::get_info(opmonlib::InfoCollector& ci, int /*level*/)
+ReversedListValidator::generate_opmon_data()
 {
-  reversedlistvalidatorinfo::Info fcr;
-
-  fcr.requests_total = m_requests_total.load();
-  fcr.new_requests = m_new_requests.exchange(0);
-  fcr.total_lists = m_total_lists.load();
-  fcr.new_lists = m_new_lists.exchange(0);
-  fcr.total_valid_pairs = m_total_valid_pairs.load();
-  fcr.valid_list_pairs = m_valid_list_pairs.exchange(0);
-  fcr.total_invalid_pairs = m_total_invalid_pairs.load();
-  fcr.invalid_list_pairs = m_invalid_list_pairs.exchange(0);
-  ci.add(fcr);
+  opmon::ReversedListValidatorInfo fcr;
+
+  fcr.set_total_requests(m_requests_total.load());
+  fcr.set_new_requests(m_new_requests.exchange(0));
+  fcr.set_total_lists(m_total_lists.load());
+  fcr.set_new_lists(m_new_lists.exchange(0));
+  fcr.set_total_valid_pairs(m_total_valid_pairs.load());
+  fcr.set_valid_list_pairs(m_valid_list_pairs.exchange(0));
+  fcr.set_total_invalid_pairs(m_total_invalid_pairs.load());
+  fcr.set_invalid_list_pairs(m_invalid_list_pairs.exchange(0));
+
+  publish(std::move(fcr));
 }
 
 

plugins/ReversedListValidator.hpp

@@ -52,7 +52,9 @@ class ReversedListValidator : public dunedaq::appfwk::DAQModule
   ReversedListValidator& operator=(ReversedListValidator&&) = delete; ///< ReversedListValidator is not move-assignable
 
   void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
-  void get_info(opmonlib::InfoCollector& ci, int level) override;
+
+protected:
+  void generate_opmon_data() override;
 
 private:
   // Commands

schema/listrev/opmon/list_rev_info.proto

@@ -0,0 +1,46 @@
+syntax = "proto3";
+
+package dunedaq.listrev.opmon;
+
+message ListReverserInfo {
+
+  uint64 requests_received = 1;
+  uint64 requests_sent = 2;
+
+  uint64 lists_received = 11;
+  uint64 lists_sent = 12;
+
+  uint64 total_requests_received = 21;
+  uint64 total_requests_sent = 22;
+
+  uint64 total_lists_received = 31;
+  uint64 total_lists_sent = 32;
+
+}
+
+
+message RandomListGeneratorInfo {
+
+  uint64 generated_numbers = 1;
+  uint64 new_generated_numbers = 2;
+
+  uint64 lists_sent = 11;
+  uint64 new_lists_sent = 12;
+
+}
+
+
+message ReversedListValidatorInfo {
+
+  uint64 total_requests = 1;
+  uint64 new_requests = 2;
+
+  uint64 total_lists = 11;
+  uint64 new_lists = 12;
+
+  uint64 total_valid_pairs = 21;
+  uint64 valid_list_pairs = 22;
+  uint64 total_invalid_pairs = 23;
+  uint64 invalid_list_pairs = 24;
+
+}