From 8fa495689860e8a3633131a6564dc073ee732538 Mon Sep 17 00:00:00 2001
From: Peter Barnes <barnes26@llnl.gov>
Date: Fri, 21 Aug 2020 16:26:33 +0000
Subject: [PATCH] Move Histogram from flow-monitor to stats

---
 CHANGES.html                                         |  3 +++
 src/flow-monitor/wscript                             |  8 ++------
 src/{flow-monitor => stats}/model/histogram.cc       |  0
 src/{flow-monitor => stats}/model/histogram.h        |  0
 .../test/histogram-test-suite.cc                     | 12 ++++++------
 src/stats/wscript                                    |  3 +++
 6 files changed, 14 insertions(+), 12 deletions(-)
 rename src/{flow-monitor => stats}/model/histogram.cc (100%)
 rename src/{flow-monitor => stats}/model/histogram.h (100%)
 rename src/{flow-monitor => stats}/test/histogram-test-suite.cc (91%)

diff --git a/CHANGES.html b/CHANGES.html
index 97772da87..bf927dc3a 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -62,6 +62,9 @@ us a note on ns-developers mailing list.</p>
 <ul>
 <li>Added "--enable-asserts" and "--enable-logs" to waf configure, to selectively enable asserts and/or logs in release and optimized builds.</li>
 <li>The <b>Sifs</b>, <b>Slot</b> and <b>Pifs</b> attributes have been moved from <b>WifiMac</b> to <b>WifiPhy</b> to better reflect that they are PHY characteristics, to decouple the MAC configuration from the PHY configuration and to ease the support for future standards.</li>
+<li>The Histogram class was moved from the flow-monitor module to the stats
+module to make it more easily accessed.  If you previously used Histogram by
+by including flow-monitor.h you will need to change that to stats-module.h.
 </ul>
 <h2>Changes to build system:</h2>
 <ul>
diff --git a/src/flow-monitor/wscript b/src/flow-monitor/wscript
index 2f3ed77ad..66060421c 100644
--- a/src/flow-monitor/wscript
+++ b/src/flow-monitor/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('flow-monitor', ['internet', 'config-store'])
+    obj = bld.create_ns3_module('flow-monitor', ['internet', 'config-store', 'stats'])
     obj.source = ["model/%s" % s for s in [
        'flow-monitor.cc',
        'flow-classifier.cc',
@@ -10,14 +10,11 @@ def build(bld):
        'ipv4-flow-probe.cc',
        'ipv6-flow-classifier.cc',
        'ipv6-flow-probe.cc',
-       'histogram.cc',
         ]]
     obj.source.append("helper/flow-monitor-helper.cc")
 
     module_test = bld.create_ns3_module_test_library('flow-monitor')
-    module_test.source = [
-        'test/histogram-test-suite.cc',
-        ]
+    module_test.source = [ ]
 
     # Tests encapsulating example programs should be listed here
     if (bld.env['ENABLE_EXAMPLES']):
@@ -35,7 +32,6 @@ def build(bld):
        'ipv4-flow-probe.h',
        'ipv6-flow-classifier.h',
        'ipv6-flow-probe.h',
-       'histogram.h',
         ]]
     headers.source.append("helper/flow-monitor-helper.h")
 
diff --git a/src/flow-monitor/model/histogram.cc b/src/stats/model/histogram.cc
similarity index 100%
rename from src/flow-monitor/model/histogram.cc
rename to src/stats/model/histogram.cc
diff --git a/src/flow-monitor/model/histogram.h b/src/stats/model/histogram.h
similarity index 100%
rename from src/flow-monitor/model/histogram.h
rename to src/stats/model/histogram.h
diff --git a/src/flow-monitor/test/histogram-test-suite.cc b/src/stats/test/histogram-test-suite.cc
similarity index 91%
rename from src/flow-monitor/test/histogram-test-suite.cc
rename to src/stats/test/histogram-test-suite.cc
index 7e41a8d04..deace503b 100644
--- a/src/flow-monitor/test/histogram-test-suite.cc
+++ b/src/stats/test/histogram-test-suite.cc
@@ -24,15 +24,15 @@
 using namespace ns3;
 
 /**
- * \ingroup flow-monitor
- * \defgroup flow-monitor-test FlowMonitor module tests
+ * \ingroup stats
+ * \defgroup stats-test Stats module tests
  */
 
 /**
- * \ingroup flow-monitor-test
+ * \ingroup stats-test
  * \ingroup tests
  *
- * \brief FlowMonitor Histogram Test
+ * \brief Histogram Test
  */
 class HistogramTestCase : public ns3::TestCase {
 private:
@@ -81,10 +81,10 @@ HistogramTestCase::DoRun (void)
 }
 
 /**
- * \ingroup flow-monitor-test
+ * \ingroup stats-test
  * \ingroup tests
  *
- * \brief FlowMonitor Histogram TestSuite
+ * \brief Histogram TestSuite
  */
 class HistogramTestSuite : public TestSuite
 {
diff --git a/src/stats/wscript b/src/stats/wscript
index 3673e9b97..8e6f7256c 100644
--- a/src/stats/wscript
+++ b/src/stats/wscript
@@ -36,6 +36,7 @@ def build(bld):
         'model/file-aggregator.cc',
         'model/gnuplot-aggregator.cc',
         'model/get-wildcard-matches.cc', 
+        'model/histogram.cc',
         ]
 
     module_test = bld.create_ns3_module_test_library('stats')
@@ -43,6 +44,7 @@ def build(bld):
         'test/basic-data-calculators-test-suite.cc',
         'test/average-test-suite.cc',
         'test/double-probe-test-suite.cc',
+        'test/histogram-test-suite.cc',
         ]
 
     # Tests encapsulating example programs should be listed here
@@ -76,6 +78,7 @@ def build(bld):
         'model/file-aggregator.h',
         'model/gnuplot-aggregator.h',
         'model/get-wildcard-matches.h',
+        'model/histogram.h',
         ]
 
     if bld.env['SQLITE_STATS']: