Temp commit
diff --git a/examples/congestion-pop.cc b/examples/congestion-pop.cc
index 9dd3a35..2b30ae8 100644
--- a/examples/congestion-pop.cc
+++ b/examples/congestion-pop.cc
@@ -26,6 +26,8 @@
#include "ns3/point-to-point-grid.h"
#include "ns3/ipv4-global-routing-helper.h"
#include "ns3/random-variable.h"
+#include "ns3/internet-module.h"
+#include "ns3/applications-module.h"
#include <iostream>
#include <sstream>
@@ -54,8 +56,10 @@
{
public:
void
- ConfigureTopology ()
+ ConfigureCcnxTopology ()
{
+ Names::Clear ();
+
string weights ("./src/NDNabstraction/examples/sprint-pops.weights");
string latencies ("./src/NDNabstraction/examples/sprint-pops.latencies");
string positions ("./src/NDNabstraction/examples/sprint-pops.positions");
@@ -108,21 +112,60 @@
m_rand = UniformVariable (0, reader.GetNodes ().GetN());
}
-public:
void
- Run (const Time &finishTime)
+ ConfigureIpv4Topology ()
{
- cout << "Run Simulation.\n";
- Simulator::Stop (finishTime);
- Simulator::Schedule (Seconds (1.0), PrintTime);
- Simulator::Run ();
- Simulator::Destroy ();
- cout << "Done.\n";
+ Names::Clear ();
+
+ string weights ("./src/NDNabstraction/examples/sprint-pops.weights");
+ string latencies ("./src/NDNabstraction/examples/sprint-pops.latencies");
+ string positions ("./src/NDNabstraction/examples/sprint-pops.positions");
+ string strategy ("ns3::CcnxBestRouteStrategy");
+ // string strategy ("ns3::CcnxFloodingStrategy");
+
+ RocketfuelWeightsReader reader ("/sprint");
+
+ reader.SetFileName (positions);
+ reader.SetFileType (RocketfuelWeightsReader::POSITIONS);
+ reader.Read ();
+
+ reader.SetFileName (weights);
+ reader.SetFileType (RocketfuelWeightsReader::WEIGHTS);
+ reader.Read ();
+
+ reader.SetFileName (latencies);
+ reader.SetFileType (RocketfuelWeightsReader::LATENCIES);
+ reader.Read ();
+
+ reader.Commit ();
+ NS_ASSERT_MSG (reader.LinksSize () != 0, "Problems reading the topology file. Failing.");
+
+ NS_LOG_INFO("Nodes = " << reader.GetNodes ().GetN());
+ NS_LOG_INFO("Links = " << reader.LinksSize ());
+
+ // ------------------------------------------------------------
+ // -- Read topology data.
+ // --------------------------------------------
+
+ InternetStackHelper stack;
+ Ipv4GlobalRoutingHelper ipv4RoutingHelper;
+ stack.SetRoutingHelper (ipv4RoutingHelper);
+ stack.Install (reader.GetNodes ());
+
+ reader.AssignIpv4Addresses (Ipv4Address ("10.0.0.0"));
+
+ // Install CCNx stack
+ NS_LOG_INFO ("Installing CCNx stack");
+ CcnxStackHelper ccnxHelper;
+ ccnxHelper.InstallFakeGlobalRoutesImpl ();
+ Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+ m_rand = UniformVariable (0, reader.GetNodes ().GetN());
}
-
-
+
+
ApplicationContainer
- AddRandomApplications (uint16_t numStreams)
+ AddCcnxRandomApplications (uint16_t numStreams)
{
map<uint32_t, set<uint32_t> > streams;
ApplicationContainer apps;
@@ -150,7 +193,7 @@
CcnxAppHelper consumerHelper ("ns3::CcnxConsumer");
consumerHelper.SetPrefix ("/" + lexical_cast<string> (node2->GetId ()));
consumerHelper.SetAttribute ("MeanRate", StringValue ("2Mbps"));
- consumerHelper.SetAttribute ("Size", StringValue ("2"));
+ consumerHelper.SetAttribute ("Size", StringValue ("1.983642578125")); //to make sure max seq # is 2000
CcnxAppHelper producerHelper ("ns3::CcnxProducer");
producerHelper.SetPrefix ("/" + lexical_cast<string> (node2->GetId ()));
@@ -167,6 +210,63 @@
return apps;
}
+ ApplicationContainer
+ AddTcpRandomApplications (uint16_t numStreams)
+ {
+ map<uint32_t, set<uint32_t> > streams;
+ ApplicationContainer apps;
+
+ const static uint32_t base_port = 1000;
+ uint16_t createdStreams = 0;
+ uint16_t guard = 0;
+ while (createdStreams < numStreams && guard < (numeric_limits<uint16_t>::max ()-1))
+ {
+ guard ++;
+
+ uint32_t node1_num = m_rand.GetValue ();
+ uint32_t node2_num = m_rand.GetValue ();
+
+ if (node1_num == node2_num)
+ continue;
+
+ if (streams[node1_num].count (node2_num) > 0) // don't create duplicate streams
+ continue;
+
+ streams[node1_num].insert (node2_num);
+
+ Ptr<Node> node1 = Names::Find<Node> ("/sprint", lexical_cast<string> (node1_num));
+ Ptr<Node> node2 = Names::Find<Node> ("/sprint", lexical_cast<string> (node2_num));
+
+ // to make sure we don't reuse the same port numbers for different flows, just make all port numbers unique
+ PacketSinkHelper consumerHelper ("ns3::TcpSocketFactory",
+ InetSocketAddress (Ipv4Address::GetAny (), base_port + createdStreams));
+
+ BulkSendHelper producerHelper ("ns3::TcpSocketFactory",
+ InetSocketAddress (Ipv4Address(node1->GetId ()), base_port + createdStreams));
+ producerHelper.SetAttribute ("MaxBytes", UintegerValue (2080000)); // equal to 2000 ccnx packets
+
+ apps.Add
+ (consumerHelper.Install (node1));
+
+ apps.Add
+ (producerHelper.Install (node2));
+
+ createdStreams ++;
+ }
+
+ return apps;
+ }
+
+ void
+ Run (const Time &finishTime)
+ {
+ cout << "Run Simulation.\n";
+ Simulator::Stop (finishTime);
+ // Simulator::Schedule (Seconds (1.0), PrintTime);
+ Simulator::Run ();
+ Simulator::Destroy ();
+ cout << "Done.\n";
+ }
UniformVariable m_rand;
};
@@ -180,19 +280,23 @@
Config::SetDefault ("ns3::PointToPointNetDevice::DataRate", StringValue ("1Mbps"));
Config::SetDefault ("ns3::DropTailQueue::MaxPackets", StringValue ("20"));
- Time finishTime = Seconds (20.0);
-
+ uint32_t maxRuns = 1;
+ uint32_t startRun = 0;
CommandLine cmd;
- cmd.AddValue ("finish", "Finish time", finishTime);
+ cmd.AddValue ("start", "Initial run number", startRun);
+ cmd.AddValue ("runs", "Number of runs", maxRuns);
cmd.Parse (argc, argv);
- Experiment experiment;
-
- for (uint32_t i = 0; i < 100; i++)
+ for (uint32_t run = startRun; run < startRun + maxRuns; run++)
{
-
+ Config::SetGlobal ("RngRun", IntegerValue (run));
+
+ Experiment experiment;
+ cout << "Run " << run << endl;
+
experiment.ConfigureTopology ();
- ApplicationContainer apps = experiment.AddRandomApplications (20);
+ // ApplicationContainer apps = experiment.AddCcnxRandomApplications (20);
+ ApplicationContainer apps = experiment.AddTcpRandomApplications (20);
for (uint32_t i = 0; i < apps.GetN () / 2; i++)
{
@@ -201,18 +305,21 @@
cout << "\n";
}
- CcnxTraceHelper traceHelper;
+ // CcnxTraceHelper traceHelper;
// traceHelper.EnableAggregateAppAll ("ns3::CcnxConsumer");
// traceHelper.EnableAggregateAppAll ("ns3::CcnxProducer");
+ // traceHelper.SetAppTraceFile (prefix + "trace-app.log");
+
+ // string prefix = "run-" + lexical_cast<string> (run) + "-";
+
// traceHelper.EnableAggregateL3All ();
// traceHelper.SetL3TraceFile ("trace-l3.log");
- // traceHelper.SetAppTraceFile ("trace-app.log");
- // traceHelper.EnableRateL3All ("rate-trace.log");
- traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumer", "consumers-seqs.log");
+ // traceHelper.EnableRateL3All (prefix + "rate-trace.log");
+ // traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumer", prefix + "consumers-seqs.log");
- experiment.Run (finishTime);
+ experiment.Run (Seconds (200.0));
}
- cout << "Finish congestion-pop scenario\n";
+ // cout << "Finish congestion-pop scenario\n";
return 0;
}