From 9c04bf2848beb52b5b64ef2a6bba35570e89a5b5 Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismagom@gmail.com>
Date: Sat, 28 Oct 2017 16:13:17 -0700
Subject: [PATCH] Removed metrics period from listener

---
 lib/include/srslte/common/metrics_hub.h | 6 +++---
 srsue/hdr/metrics_csv.h                 | 4 +++-
 srsue/hdr/metrics_stdout.h              | 4 +++-
 srsue/src/main.cc                       | 2 ++
 srsue/src/metrics_csv.cc                | 9 +++++++--
 srsue/src/metrics_stdout.cc             | 6 +++++-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/include/srslte/common/metrics_hub.h b/lib/include/srslte/common/metrics_hub.h
index 66cc4acbd..a9b77d5f6 100644
--- a/lib/include/srslte/common/metrics_hub.h
+++ b/lib/include/srslte/common/metrics_hub.h
@@ -24,8 +24,8 @@ template<typename metrics_t>
 class metrics_listener
 {
 public: 
-  virtual void set_metrics(metrics_t &m, float report_period_secs=1.0) = 0;
-}; 
+  virtual void set_metrics(metrics_t &m) = 0;
+};
 
 template<typename metrics_t>
 class metrics_hub : public periodic_thread
@@ -57,7 +57,7 @@ private:
       bzero(&metric, sizeof(metrics_t));
       m->get_metrics(metric);
       for (uint32_t i=0;i<listeners.size();i++) {
-        listeners[i]->set_metrics(metric, report_period_secs);
+        listeners[i]->set_metrics(metric);
       }
     }
   }
diff --git a/srsue/hdr/metrics_csv.h b/srsue/hdr/metrics_csv.h
index a897265d2..f0b3e48c4 100644
--- a/srsue/hdr/metrics_csv.h
+++ b/srsue/hdr/metrics_csv.h
@@ -48,12 +48,14 @@ class metrics_csv : public srslte::metrics_listener<ue_metrics_t>
 public:
   metrics_csv(std::string filename);
 
-  void set_metrics(ue_metrics_t &m, float report_period_secs);
+  void set_periodicity(float metrics_report_period_sec);
+  void set_metrics(ue_metrics_t &m);
   void set_ue_handle(ue_metrics_interface *ue_);
 
 private:
   std::string float_to_string(float f, int digits, bool add_semicolon = true);
 
+  float                 metrics_report_period;
   std::ofstream         file;
   ue_metrics_interface* ue;
   uint32_t              n_reports;
diff --git a/srsue/hdr/metrics_stdout.h b/srsue/hdr/metrics_stdout.h
index 8ae33b24e..87a67cb2e 100644
--- a/srsue/hdr/metrics_stdout.h
+++ b/srsue/hdr/metrics_stdout.h
@@ -46,8 +46,9 @@ class metrics_stdout : public srslte::metrics_listener<ue_metrics_t>
 public:
   metrics_stdout();
 
+  void set_periodicity(float metrics_report_period_sec);
   void toggle_print(bool b);
-  void set_metrics(ue_metrics_t &m, float report_period_secs);
+  void set_metrics(ue_metrics_t &m);
   void set_ue_handle(ue_metrics_interface *ue_);
 
 private:
@@ -55,6 +56,7 @@ private:
   std::string float_to_eng_string(float f, int digits);
   std::string int_to_eng_string(int f, int digits);
 
+  float                 metrics_report_period;
   bool                  do_print;
   uint8_t               n_reports;
   ue_metrics_interface* ue;
diff --git a/srsue/src/main.cc b/srsue/src/main.cc
index b933b66f3..01f77f2fa 100644
--- a/srsue/src/main.cc
+++ b/srsue/src/main.cc
@@ -386,11 +386,13 @@ int main(int argc, char *argv[])
   metricshub.init(ue, args.expert.metrics_period_secs);
   metricshub.add_listener(&metrics_screen);
   metrics_screen.set_ue_handle(ue);
+  metrics_screen.set_periodicity(args.expert.metrics_period_secs);
 
   metrics_csv metrics_file(args.expert.metrics_csv_filename);
   if (args.expert.metrics_csv_enable) {
     metricshub.add_listener(&metrics_file);
     metrics_file.set_ue_handle(ue);
+    metrics_file.set_periodicity(args.expert.metrics_period_secs);
   }
 
   pthread_t input;
diff --git a/srsue/src/metrics_csv.cc b/srsue/src/metrics_csv.cc
index f9bdce213..7c84659b5 100644
--- a/srsue/src/metrics_csv.cc
+++ b/srsue/src/metrics_csv.cc
@@ -43,6 +43,7 @@ namespace srsue{
 
 metrics_csv::metrics_csv(std::string filename)
   :n_reports(0)
+  ,metrics_report_period(1.0)
   ,ue(NULL)
 {
   file.open(filename.c_str());
@@ -53,7 +54,11 @@ void metrics_csv::set_ue_handle(ue_metrics_interface *ue_)
   ue = ue_;
 }
 
-void metrics_csv::set_metrics(ue_metrics_t &metrics, float metrics_report_period)
+void metrics_csv::set_periodicity(float metrics_report_period_sec) {
+  this->metrics_report_period = metrics_report_period_sec;
+}
+
+void metrics_csv::set_metrics(ue_metrics_t &metrics)
 {
   if (file.is_open() && ue != NULL) {
     if(n_reports == 0) {
@@ -75,7 +80,7 @@ void metrics_csv::set_metrics(ue_metrics_t &metrics, float metrics_report_period
     file << float_to_string(metrics.phy.ul.mcs, 2);
     file << float_to_string((float) metrics.mac.ul_buffer, 2);
     file << float_to_string((float) metrics.mac.tx_brate/metrics_report_period, 2);
-    if (metrics.mac.tx_pkts > 0) {
+      if (metrics.mac.tx_pkts > 0) {
       file << float_to_string((float) 100*metrics.mac.tx_errors/metrics.mac.tx_pkts, 1);
     } else {
       file << float_to_string(0, 2);
diff --git a/srsue/src/metrics_stdout.cc b/srsue/src/metrics_stdout.cc
index 048532c8f..9f413b65f 100644
--- a/srsue/src/metrics_stdout.cc
+++ b/srsue/src/metrics_stdout.cc
@@ -50,6 +50,7 @@ char const * const prefixes[2][9] =
 metrics_stdout::metrics_stdout()
     :do_print(false)
     ,n_reports(10)
+    ,metrics_report_period(1.0)
     ,ue(NULL)
 {
 }
@@ -64,8 +65,11 @@ void metrics_stdout::toggle_print(bool b)
   do_print = b;
 }
 
+void metrics_stdout::set_periodicity(float metrics_report_period_sec) {
+  this->metrics_report_period = metrics_report_period_sec;
+}
 
-void metrics_stdout::set_metrics(ue_metrics_t &metrics, float metrics_report_period)
+void metrics_stdout::set_metrics(ue_metrics_t &metrics)
 {
   if(!do_print || ue == NULL)
     return;