1.1 --- a/utils/flowmon/flowmon-bench.py Sat May 23 17:57:09 2009 +0100
1.2 +++ b/utils/flowmon/flowmon-bench.py Mon May 25 15:04:42 2009 +0100
1.3 @@ -54,12 +54,10 @@
1.4 ns3.RandomVariable.UseGlobalSeed(1, 1, 2, 3, 5, 8)
1.5 ns3.RandomVariable.SetRunNumber(run_number)
1.6
1.7 - #ns3.Config.SetDefault("ns3::DropTailQueue::MaxPackets", ns3.StringValue("10"))
1.8 -
1.9 # -- create the topology --
1.10 -
1.11 p2p = ns3.PointToPointHelper()
1.12 p2p.SetChannelAttribute("Delay", ns3.StringValue("0ms"))
1.13 + p2p.SetQueue("ns3::DropTailQueue", "MaxPackets", ns3.StringValue("100"))
1.14
1.15 internet = ns3.InternetStackHelper()
1.16 ipv4Addresses = ns3.Ipv4AddressHelper()
1.17 @@ -128,10 +126,10 @@
1.18 app.Start(ns3.Seconds(start_time_rng.GetValue()))
1.19
1.20 # flow from node (yi, xi+flow_hops) to (yi, xi)
1.21 - destaddr = get_node_address(nodes[yi][xi])
1.22 - onOffHelper.SetAttribute("Remote", ns3.AddressValue(ns3.InetSocketAddress(destaddr, port)))
1.23 - app = onOffHelper.Install(ns3.NodeContainer(nodes[yi][xi+flow_hops]))
1.24 - app.Start(ns3.Seconds(start_time_rng.GetValue()))
1.25 + #destaddr = get_node_address(nodes[yi][xi])
1.26 + #onOffHelper.SetAttribute("Remote", ns3.AddressValue(ns3.InetSocketAddress(destaddr, port)))
1.27 + #app = onOffHelper.Install(ns3.NodeContainer(nodes[yi][xi+flow_hops]))
1.28 + #app.Start(ns3.Seconds(start_time_rng.GetValue()))
1.29
1.30
1.31 # -- create the flow monitor, if requested --
2.1 --- a/utils/flowmon/plot.py Sat May 23 17:57:09 2009 +0100
2.2 +++ b/utils/flowmon/plot.py Mon May 25 15:04:42 2009 +0100
2.3 @@ -124,6 +124,8 @@
2.4 return math.sqrt(v)
2.5
2.6
2.7 +
2.8 +
2.9 def histograms(results):
2.10 num_nodes_side_set = list(set(sim.num_nodes_side for sim in results.simulations))
2.11 num_nodes_side_set.sort()