From bebeba14eedf919b4716b527f140ef150f344e64 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 22 Mar 2011 16:56:10 -0700 Subject: [PATCH] Move flow-monitor module out of contrib directory --- src/{contrib => }/flow-monitor/bindings/callbacks_list.py | 0 .../flow-monitor/bindings/modulegen__gcc_ILP32.py | 0 .../flow-monitor/bindings/modulegen__gcc_LP64.py | 0 src/{contrib => }/flow-monitor/doc/design.txt | 0 .../flow-monitor/examples/flowmon-parse-results.py | 0 .../flow-monitor/examples/wifi-olsr-flowmon.py | 0 .../flow-monitor/helper/flow-monitor-helper.cc | 0 .../flow-monitor/helper/flow-monitor-helper.h | 0 src/{contrib => }/flow-monitor/model/flow-classifier.cc | 0 src/{contrib => }/flow-monitor/model/flow-classifier.h | 0 src/{contrib => }/flow-monitor/model/flow-monitor.cc | 0 src/{contrib => }/flow-monitor/model/flow-monitor.h | 0 src/{contrib => }/flow-monitor/model/flow-probe.cc | 0 src/{contrib => }/flow-monitor/model/flow-probe.h | 0 src/{contrib => }/flow-monitor/model/histogram.cc | 0 src/{contrib => }/flow-monitor/model/histogram.h | 0 .../flow-monitor/model/ipv4-flow-classifier.cc | 0 .../flow-monitor/model/ipv4-flow-classifier.h | 0 src/{contrib => }/flow-monitor/model/ipv4-flow-probe.cc | 0 src/{contrib => }/flow-monitor/model/ipv4-flow-probe.h | 0 src/{contrib => }/flow-monitor/test/examples-to-run.py | 8 ++++---- src/{contrib => }/flow-monitor/waf | 0 src/{contrib => }/flow-monitor/wscript | 0 src/wscript | 2 +- 24 files changed, 5 insertions(+), 5 deletions(-) rename src/{contrib => }/flow-monitor/bindings/callbacks_list.py (100%) rename src/{contrib => }/flow-monitor/bindings/modulegen__gcc_ILP32.py (100%) rename src/{contrib => }/flow-monitor/bindings/modulegen__gcc_LP64.py (100%) rename src/{contrib => }/flow-monitor/doc/design.txt (100%) rename src/{contrib => }/flow-monitor/examples/flowmon-parse-results.py (100%) rename src/{contrib => }/flow-monitor/examples/wifi-olsr-flowmon.py (100%) rename src/{contrib => }/flow-monitor/helper/flow-monitor-helper.cc (100%) rename src/{contrib => }/flow-monitor/helper/flow-monitor-helper.h (100%) rename src/{contrib => }/flow-monitor/model/flow-classifier.cc (100%) rename src/{contrib => }/flow-monitor/model/flow-classifier.h (100%) rename src/{contrib => }/flow-monitor/model/flow-monitor.cc (100%) rename src/{contrib => }/flow-monitor/model/flow-monitor.h (100%) rename src/{contrib => }/flow-monitor/model/flow-probe.cc (100%) rename src/{contrib => }/flow-monitor/model/flow-probe.h (100%) rename src/{contrib => }/flow-monitor/model/histogram.cc (100%) rename src/{contrib => }/flow-monitor/model/histogram.h (100%) rename src/{contrib => }/flow-monitor/model/ipv4-flow-classifier.cc (100%) rename src/{contrib => }/flow-monitor/model/ipv4-flow-classifier.h (100%) rename src/{contrib => }/flow-monitor/model/ipv4-flow-probe.cc (100%) rename src/{contrib => }/flow-monitor/model/ipv4-flow-probe.h (100%) rename src/{contrib => }/flow-monitor/test/examples-to-run.py (93%) rename src/{contrib => }/flow-monitor/waf (100%) rename src/{contrib => }/flow-monitor/wscript (100%) diff --git a/src/contrib/flow-monitor/bindings/callbacks_list.py b/src/flow-monitor/bindings/callbacks_list.py similarity index 100% rename from src/contrib/flow-monitor/bindings/callbacks_list.py rename to src/flow-monitor/bindings/callbacks_list.py diff --git a/src/contrib/flow-monitor/bindings/modulegen__gcc_ILP32.py b/src/flow-monitor/bindings/modulegen__gcc_ILP32.py similarity index 100% rename from src/contrib/flow-monitor/bindings/modulegen__gcc_ILP32.py rename to src/flow-monitor/bindings/modulegen__gcc_ILP32.py diff --git a/src/contrib/flow-monitor/bindings/modulegen__gcc_LP64.py b/src/flow-monitor/bindings/modulegen__gcc_LP64.py similarity index 100% rename from src/contrib/flow-monitor/bindings/modulegen__gcc_LP64.py rename to src/flow-monitor/bindings/modulegen__gcc_LP64.py diff --git a/src/contrib/flow-monitor/doc/design.txt b/src/flow-monitor/doc/design.txt similarity index 100% rename from src/contrib/flow-monitor/doc/design.txt rename to src/flow-monitor/doc/design.txt diff --git a/src/contrib/flow-monitor/examples/flowmon-parse-results.py b/src/flow-monitor/examples/flowmon-parse-results.py similarity index 100% rename from src/contrib/flow-monitor/examples/flowmon-parse-results.py rename to src/flow-monitor/examples/flowmon-parse-results.py diff --git a/src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py b/src/flow-monitor/examples/wifi-olsr-flowmon.py similarity index 100% rename from src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py rename to src/flow-monitor/examples/wifi-olsr-flowmon.py diff --git a/src/contrib/flow-monitor/helper/flow-monitor-helper.cc b/src/flow-monitor/helper/flow-monitor-helper.cc similarity index 100% rename from src/contrib/flow-monitor/helper/flow-monitor-helper.cc rename to src/flow-monitor/helper/flow-monitor-helper.cc diff --git a/src/contrib/flow-monitor/helper/flow-monitor-helper.h b/src/flow-monitor/helper/flow-monitor-helper.h similarity index 100% rename from src/contrib/flow-monitor/helper/flow-monitor-helper.h rename to src/flow-monitor/helper/flow-monitor-helper.h diff --git a/src/contrib/flow-monitor/model/flow-classifier.cc b/src/flow-monitor/model/flow-classifier.cc similarity index 100% rename from src/contrib/flow-monitor/model/flow-classifier.cc rename to src/flow-monitor/model/flow-classifier.cc diff --git a/src/contrib/flow-monitor/model/flow-classifier.h b/src/flow-monitor/model/flow-classifier.h similarity index 100% rename from src/contrib/flow-monitor/model/flow-classifier.h rename to src/flow-monitor/model/flow-classifier.h diff --git a/src/contrib/flow-monitor/model/flow-monitor.cc b/src/flow-monitor/model/flow-monitor.cc similarity index 100% rename from src/contrib/flow-monitor/model/flow-monitor.cc rename to src/flow-monitor/model/flow-monitor.cc diff --git a/src/contrib/flow-monitor/model/flow-monitor.h b/src/flow-monitor/model/flow-monitor.h similarity index 100% rename from src/contrib/flow-monitor/model/flow-monitor.h rename to src/flow-monitor/model/flow-monitor.h diff --git a/src/contrib/flow-monitor/model/flow-probe.cc b/src/flow-monitor/model/flow-probe.cc similarity index 100% rename from src/contrib/flow-monitor/model/flow-probe.cc rename to src/flow-monitor/model/flow-probe.cc diff --git a/src/contrib/flow-monitor/model/flow-probe.h b/src/flow-monitor/model/flow-probe.h similarity index 100% rename from src/contrib/flow-monitor/model/flow-probe.h rename to src/flow-monitor/model/flow-probe.h diff --git a/src/contrib/flow-monitor/model/histogram.cc b/src/flow-monitor/model/histogram.cc similarity index 100% rename from src/contrib/flow-monitor/model/histogram.cc rename to src/flow-monitor/model/histogram.cc diff --git a/src/contrib/flow-monitor/model/histogram.h b/src/flow-monitor/model/histogram.h similarity index 100% rename from src/contrib/flow-monitor/model/histogram.h rename to src/flow-monitor/model/histogram.h diff --git a/src/contrib/flow-monitor/model/ipv4-flow-classifier.cc b/src/flow-monitor/model/ipv4-flow-classifier.cc similarity index 100% rename from src/contrib/flow-monitor/model/ipv4-flow-classifier.cc rename to src/flow-monitor/model/ipv4-flow-classifier.cc diff --git a/src/contrib/flow-monitor/model/ipv4-flow-classifier.h b/src/flow-monitor/model/ipv4-flow-classifier.h similarity index 100% rename from src/contrib/flow-monitor/model/ipv4-flow-classifier.h rename to src/flow-monitor/model/ipv4-flow-classifier.h diff --git a/src/contrib/flow-monitor/model/ipv4-flow-probe.cc b/src/flow-monitor/model/ipv4-flow-probe.cc similarity index 100% rename from src/contrib/flow-monitor/model/ipv4-flow-probe.cc rename to src/flow-monitor/model/ipv4-flow-probe.cc diff --git a/src/contrib/flow-monitor/model/ipv4-flow-probe.h b/src/flow-monitor/model/ipv4-flow-probe.h similarity index 100% rename from src/contrib/flow-monitor/model/ipv4-flow-probe.h rename to src/flow-monitor/model/ipv4-flow-probe.h diff --git a/src/contrib/flow-monitor/test/examples-to-run.py b/src/flow-monitor/test/examples-to-run.py similarity index 93% rename from src/contrib/flow-monitor/test/examples-to-run.py rename to src/flow-monitor/test/examples-to-run.py index fb9209a73..a00bc7b9c 100644 --- a/src/contrib/flow-monitor/test/examples-to-run.py +++ b/src/flow-monitor/test/examples-to-run.py @@ -7,9 +7,7 @@ # (example_name, do_run, do_valgrind_run). # # See test.py for more information. -cpp_examples = [ - ("wifi-olsr-flowmon.py", "True"), -] +cpp_examples = [] # A list of Python examples to run in order to ensure that they remain # runnable over time. Each tuple in the list contains @@ -17,4 +15,6 @@ cpp_examples = [ # (example_name, do_run). # # See test.py for more information. -python_examples = [] +python_examples = [ + ("wifi-olsr-flowmon.py", "True"), +] diff --git a/src/contrib/flow-monitor/waf b/src/flow-monitor/waf similarity index 100% rename from src/contrib/flow-monitor/waf rename to src/flow-monitor/waf diff --git a/src/contrib/flow-monitor/wscript b/src/flow-monitor/wscript similarity index 100% rename from src/contrib/flow-monitor/wscript rename to src/flow-monitor/wscript diff --git a/src/wscript b/src/wscript index dd86418a4..9317a62a0 100644 --- a/src/wscript +++ b/src/wscript @@ -49,7 +49,7 @@ all_modules = ( 'test', 'test/ns3tcp', 'test/ns3wifi', - 'contrib/flow-monitor', + 'flow-monitor', 'wimax', 'lte', 'mpi',