From a870eef8b75c61434f79cf0f334d72db24fa628f Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Fri, 4 Mar 2011 10:56:07 -0800 Subject: [PATCH] Modularize stats module and move it to src --- src/contrib/wscript | 2 -- .../model}/basic-data-calculators.h | 0 .../stats => stats/model}/data-calculator.cc | 0 .../stats => stats/model}/data-calculator.h | 0 .../stats => stats/model}/data-collector.cc | 0 .../stats => stats/model}/data-collector.h | 0 .../model}/data-output-interface.cc | 0 .../model}/data-output-interface.h | 0 .../model}/omnet-data-output.cc | 0 .../stats => stats/model}/omnet-data-output.h | 0 .../model}/packet-data-calculators.cc | 0 .../model}/packet-data-calculators.h | 0 .../model}/sqlite-data-output.cc | 0 .../model}/sqlite-data-output.h | 0 .../model}/time-data-calculators.cc | 0 .../model}/time-data-calculators.h | 0 src/{contrib => }/stats/wscript | 30 +++++++++---------- src/wscript | 2 +- 18 files changed, 16 insertions(+), 18 deletions(-) rename src/{contrib/stats => stats/model}/basic-data-calculators.h (100%) rename src/{contrib/stats => stats/model}/data-calculator.cc (100%) rename src/{contrib/stats => stats/model}/data-calculator.h (100%) rename src/{contrib/stats => stats/model}/data-collector.cc (100%) rename src/{contrib/stats => stats/model}/data-collector.h (100%) rename src/{contrib/stats => stats/model}/data-output-interface.cc (100%) rename src/{contrib/stats => stats/model}/data-output-interface.h (100%) rename src/{contrib/stats => stats/model}/omnet-data-output.cc (100%) rename src/{contrib/stats => stats/model}/omnet-data-output.h (100%) rename src/{contrib/stats => stats/model}/packet-data-calculators.cc (100%) rename src/{contrib/stats => stats/model}/packet-data-calculators.h (100%) rename src/{contrib/stats => stats/model}/sqlite-data-output.cc (100%) rename src/{contrib/stats => stats/model}/sqlite-data-output.h (100%) rename src/{contrib/stats => stats/model}/time-data-calculators.cc (100%) rename src/{contrib/stats => stats/model}/time-data-calculators.h (100%) rename src/{contrib => }/stats/wscript (51%) diff --git a/src/contrib/wscript b/src/contrib/wscript index 7ba2f68f7..f8ed84caa 100644 --- a/src/contrib/wscript +++ b/src/contrib/wscript @@ -16,8 +16,6 @@ def configure(conf): "library 'libxml-2.0 >= 2.7' not found") conf.write_config_header('ns3/contrib-config.h', top=True) - conf.sub_config('stats') - def build(bld): module = bld.create_ns3_module('contrib', ['core', 'network']) diff --git a/src/contrib/stats/basic-data-calculators.h b/src/stats/model/basic-data-calculators.h similarity index 100% rename from src/contrib/stats/basic-data-calculators.h rename to src/stats/model/basic-data-calculators.h diff --git a/src/contrib/stats/data-calculator.cc b/src/stats/model/data-calculator.cc similarity index 100% rename from src/contrib/stats/data-calculator.cc rename to src/stats/model/data-calculator.cc diff --git a/src/contrib/stats/data-calculator.h b/src/stats/model/data-calculator.h similarity index 100% rename from src/contrib/stats/data-calculator.h rename to src/stats/model/data-calculator.h diff --git a/src/contrib/stats/data-collector.cc b/src/stats/model/data-collector.cc similarity index 100% rename from src/contrib/stats/data-collector.cc rename to src/stats/model/data-collector.cc diff --git a/src/contrib/stats/data-collector.h b/src/stats/model/data-collector.h similarity index 100% rename from src/contrib/stats/data-collector.h rename to src/stats/model/data-collector.h diff --git a/src/contrib/stats/data-output-interface.cc b/src/stats/model/data-output-interface.cc similarity index 100% rename from src/contrib/stats/data-output-interface.cc rename to src/stats/model/data-output-interface.cc diff --git a/src/contrib/stats/data-output-interface.h b/src/stats/model/data-output-interface.h similarity index 100% rename from src/contrib/stats/data-output-interface.h rename to src/stats/model/data-output-interface.h diff --git a/src/contrib/stats/omnet-data-output.cc b/src/stats/model/omnet-data-output.cc similarity index 100% rename from src/contrib/stats/omnet-data-output.cc rename to src/stats/model/omnet-data-output.cc diff --git a/src/contrib/stats/omnet-data-output.h b/src/stats/model/omnet-data-output.h similarity index 100% rename from src/contrib/stats/omnet-data-output.h rename to src/stats/model/omnet-data-output.h diff --git a/src/contrib/stats/packet-data-calculators.cc b/src/stats/model/packet-data-calculators.cc similarity index 100% rename from src/contrib/stats/packet-data-calculators.cc rename to src/stats/model/packet-data-calculators.cc diff --git a/src/contrib/stats/packet-data-calculators.h b/src/stats/model/packet-data-calculators.h similarity index 100% rename from src/contrib/stats/packet-data-calculators.h rename to src/stats/model/packet-data-calculators.h diff --git a/src/contrib/stats/sqlite-data-output.cc b/src/stats/model/sqlite-data-output.cc similarity index 100% rename from src/contrib/stats/sqlite-data-output.cc rename to src/stats/model/sqlite-data-output.cc diff --git a/src/contrib/stats/sqlite-data-output.h b/src/stats/model/sqlite-data-output.h similarity index 100% rename from src/contrib/stats/sqlite-data-output.h rename to src/stats/model/sqlite-data-output.h diff --git a/src/contrib/stats/time-data-calculators.cc b/src/stats/model/time-data-calculators.cc similarity index 100% rename from src/contrib/stats/time-data-calculators.cc rename to src/stats/model/time-data-calculators.cc diff --git a/src/contrib/stats/time-data-calculators.h b/src/stats/model/time-data-calculators.h similarity index 100% rename from src/contrib/stats/time-data-calculators.h rename to src/stats/model/time-data-calculators.h diff --git a/src/contrib/stats/wscript b/src/stats/wscript similarity index 51% rename from src/contrib/stats/wscript rename to src/stats/wscript index f2a1ca812..f69ac27e6 100644 --- a/src/contrib/stats/wscript +++ b/src/stats/wscript @@ -10,26 +10,26 @@ def configure(conf): def build(bld): obj = bld.create_ns3_module('stats', ['network']) obj.source = [ - 'data-calculator.cc', - 'packet-data-calculators.cc', - 'time-data-calculators.cc', - 'data-output-interface.cc', - 'omnet-data-output.cc', - 'data-collector.cc', + 'model/data-calculator.cc', + 'model/packet-data-calculators.cc', + 'model/time-data-calculators.cc', + 'model/data-output-interface.cc', + 'model/omnet-data-output.cc', + 'model/data-collector.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'stats' headers.source = [ - 'data-calculator.h', - 'packet-data-calculators.h', - 'time-data-calculators.h', - 'basic-data-calculators.h', - 'data-output-interface.h', - 'omnet-data-output.h', - 'data-collector.h', + 'model/data-calculator.h', + 'model/packet-data-calculators.h', + 'model/time-data-calculators.h', + 'model/basic-data-calculators.h', + 'model/data-output-interface.h', + 'model/omnet-data-output.h', + 'model/data-collector.h', ] if bld.env['SQLITE_STATS']: - headers.source.append('sqlite-data-output.h') - obj.source.append('sqlite-data-output.cc') + headers.source.append('model/sqlite-data-output.h') + obj.source.append('model/sqlite-data-output.cc') obj.uselib = 'SQLITE3' diff --git a/src/wscript b/src/wscript index e6b7460c3..97e492bab 100644 --- a/src/wscript +++ b/src/wscript @@ -38,7 +38,7 @@ all_modules = ( 'mobility', 'wifi', 'helper', - 'contrib/stats', + 'stats', 'uan', 'spectrum', 'mesh',