From 58a17e5fae22c2f208aade413b8379661eb3fe81 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Fri, 22 Oct 2010 17:18:49 +0100 Subject: [PATCH] Adapt the flow-monitor module to the new module tree layout spec. --- examples/flowmon/waf | 1 - examples/flowmon/wscript | 4 ---- 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 | 2 +- .../flow-monitor/{ => model}/flow-classifier.cc | 0 .../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 .../flow-monitor/{ => model}/ipv4-flow-probe.cc | 0 .../flow-monitor/{ => model}/ipv4-flow-probe.h | 0 src/contrib/flow-monitor/wscript | 12 +++++++----- src/helper/wscript | 2 -- 21 files changed, 8 insertions(+), 13 deletions(-) delete mode 100755 examples/flowmon/waf delete mode 100644 examples/flowmon/wscript rename src/contrib/flow-monitor/{ => doc}/design.txt (100%) rename {examples/flowmon => src/contrib/flow-monitor/examples}/flowmon-parse-results.py (100%) rename {examples/flowmon => 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 (98%) 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%) diff --git a/examples/flowmon/waf b/examples/flowmon/waf deleted file mode 100755 index 941d56b43..000000000 --- a/examples/flowmon/waf +++ /dev/null @@ -1 +0,0 @@ -exec "`dirname "$0"`"/../../waf "$@" diff --git a/examples/flowmon/wscript b/examples/flowmon/wscript deleted file mode 100644 index 594d10cf5..000000000 --- a/examples/flowmon/wscript +++ /dev/null @@ -1,4 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - pass diff --git a/src/contrib/flow-monitor/design.txt b/src/contrib/flow-monitor/doc/design.txt similarity index 100% rename from src/contrib/flow-monitor/design.txt rename to src/contrib/flow-monitor/doc/design.txt diff --git a/examples/flowmon/flowmon-parse-results.py b/src/contrib/flow-monitor/examples/flowmon-parse-results.py similarity index 100% rename from examples/flowmon/flowmon-parse-results.py rename to src/contrib/flow-monitor/examples/flowmon-parse-results.py diff --git a/examples/flowmon/wifi-olsr-flowmon.py b/src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py similarity index 100% rename from examples/flowmon/wifi-olsr-flowmon.py rename to src/contrib/flow-monitor/examples/wifi-olsr-flowmon.py diff --git a/src/helper/flow-monitor-helper.cc b/src/contrib/flow-monitor/helper/flow-monitor-helper.cc similarity index 100% rename from src/helper/flow-monitor-helper.cc rename to src/contrib/flow-monitor/helper/flow-monitor-helper.cc diff --git a/src/helper/flow-monitor-helper.h b/src/contrib/flow-monitor/helper/flow-monitor-helper.h similarity index 98% rename from src/helper/flow-monitor-helper.h rename to src/contrib/flow-monitor/helper/flow-monitor-helper.h index 409872d08..3539ec421 100644 --- a/src/helper/flow-monitor-helper.h +++ b/src/contrib/flow-monitor/helper/flow-monitor-helper.h @@ -20,7 +20,7 @@ #ifndef FLOW_MONITOR_HELPER_H #define FLOW_MONITOR_HELPER_H -#include "node-container.h" +#include "ns3/node-container.h" #include "ns3/object-factory.h" #include "ns3/flow-monitor.h" #include "ns3/flow-classifier.h" diff --git a/src/contrib/flow-monitor/flow-classifier.cc b/src/contrib/flow-monitor/model/flow-classifier.cc similarity index 100% rename from src/contrib/flow-monitor/flow-classifier.cc rename to src/contrib/flow-monitor/model/flow-classifier.cc diff --git a/src/contrib/flow-monitor/flow-classifier.h b/src/contrib/flow-monitor/model/flow-classifier.h similarity index 100% rename from src/contrib/flow-monitor/flow-classifier.h rename to src/contrib/flow-monitor/model/flow-classifier.h diff --git a/src/contrib/flow-monitor/flow-monitor.cc b/src/contrib/flow-monitor/model/flow-monitor.cc similarity index 100% rename from src/contrib/flow-monitor/flow-monitor.cc rename to src/contrib/flow-monitor/model/flow-monitor.cc diff --git a/src/contrib/flow-monitor/flow-monitor.h b/src/contrib/flow-monitor/model/flow-monitor.h similarity index 100% rename from src/contrib/flow-monitor/flow-monitor.h rename to src/contrib/flow-monitor/model/flow-monitor.h diff --git a/src/contrib/flow-monitor/flow-probe.cc b/src/contrib/flow-monitor/model/flow-probe.cc similarity index 100% rename from src/contrib/flow-monitor/flow-probe.cc rename to src/contrib/flow-monitor/model/flow-probe.cc diff --git a/src/contrib/flow-monitor/flow-probe.h b/src/contrib/flow-monitor/model/flow-probe.h similarity index 100% rename from src/contrib/flow-monitor/flow-probe.h rename to src/contrib/flow-monitor/model/flow-probe.h diff --git a/src/contrib/flow-monitor/histogram.cc b/src/contrib/flow-monitor/model/histogram.cc similarity index 100% rename from src/contrib/flow-monitor/histogram.cc rename to src/contrib/flow-monitor/model/histogram.cc diff --git a/src/contrib/flow-monitor/histogram.h b/src/contrib/flow-monitor/model/histogram.h similarity index 100% rename from src/contrib/flow-monitor/histogram.h rename to src/contrib/flow-monitor/model/histogram.h diff --git a/src/contrib/flow-monitor/ipv4-flow-classifier.cc b/src/contrib/flow-monitor/model/ipv4-flow-classifier.cc similarity index 100% rename from src/contrib/flow-monitor/ipv4-flow-classifier.cc rename to src/contrib/flow-monitor/model/ipv4-flow-classifier.cc diff --git a/src/contrib/flow-monitor/ipv4-flow-classifier.h b/src/contrib/flow-monitor/model/ipv4-flow-classifier.h similarity index 100% rename from src/contrib/flow-monitor/ipv4-flow-classifier.h rename to src/contrib/flow-monitor/model/ipv4-flow-classifier.h diff --git a/src/contrib/flow-monitor/ipv4-flow-probe.cc b/src/contrib/flow-monitor/model/ipv4-flow-probe.cc similarity index 100% rename from src/contrib/flow-monitor/ipv4-flow-probe.cc rename to src/contrib/flow-monitor/model/ipv4-flow-probe.cc diff --git a/src/contrib/flow-monitor/ipv4-flow-probe.h b/src/contrib/flow-monitor/model/ipv4-flow-probe.h similarity index 100% rename from src/contrib/flow-monitor/ipv4-flow-probe.h rename to src/contrib/flow-monitor/model/ipv4-flow-probe.h diff --git a/src/contrib/flow-monitor/wscript b/src/contrib/flow-monitor/wscript index 71872a8da..bf3936661 100644 --- a/src/contrib/flow-monitor/wscript +++ b/src/contrib/flow-monitor/wscript @@ -2,22 +2,24 @@ def build(bld): obj = bld.create_ns3_module('flow-monitor', ['internet-stack']) - obj.source = [ + obj.source = ["model/%s" % s for s in [ 'flow-monitor.cc', 'flow-classifier.cc', 'flow-probe.cc', 'ipv4-flow-classifier.cc', 'ipv4-flow-probe.cc', 'histogram.cc', - ] + ]] + obj.source.append("helper/flow-monitor-helper.cc") + headers = bld.new_task_gen('ns3header') headers.module = 'flow-monitor' - headers.source = [ + headers.source = ["model/%s" % s for s in [ 'flow-monitor.h', 'flow-probe.h', 'flow-classifier.h', 'ipv4-flow-classifier.h', 'ipv4-flow-probe.h', 'histogram.h', - ] - + ]] + headers.source.append("helper/flow-monitor-helper.h") diff --git a/src/helper/wscript b/src/helper/wscript index 940cab48a..9ff7e5b7e 100644 --- a/src/helper/wscript +++ b/src/helper/wscript @@ -42,7 +42,6 @@ def build(bld): 'ipv6-list-routing-helper.cc', 'ipv6-routing-helper.cc', 'ping6-helper.cc', - 'flow-monitor-helper.cc', 'animation-interface.cc', 'canvas-location.cc', 'point-to-point-dumbbell-helper.cc', @@ -100,7 +99,6 @@ def build(bld): 'ipv6-list-routing-helper.h', 'ipv6-routing-helper.h', 'ping6-helper.h', - 'flow-monitor-helper.h', 'animation-interface.h', 'canvas-location.h', 'point-to-point-dumbbell-helper.h',