tomh/ns-3-dev-spectrum-wifi: comparison src/nix-vector-routing/examples/nms-p2p-nix.cc

equal deleted inserted replaced

-:d14e2430213d
+:32755d0516f4
 #include "ns3/simulator.h"
 #include "ns3/ipv4-static-routing-helper.h"
 #include "ns3/ipv4-list-routing-helper.h"
 #include "ns3/ipv4-nix-vector-helper.h"
-using namespace std;
 using namespace ns3;
 typedef struct timeval TIMER_TYPE;
 #define TIMER_NOW(_t) gettimeofday (&_t,NULL);
 #define TIMER_SECONDS(_t) ((double)(_t).tv_sec + (_t).tv_usec*1e-6)
 int
 main (int argc, char *argv[])
 {
 TIMER_TYPE t0, t1, t2;
 TIMER_NOW (t0);
-cout << " ==== DARPA NMS CAMPUS NETWORK SIMULATION ====" << endl;
+std::cout << " ==== DARPA NMS CAMPUS NETWORK SIMULATION ====" << std::endl;
 LogComponentEnable ("OnOffApplication", LOG_LEVEL_INFO);
 int nCN = 2, nLANClients = 42;
 bool nix = true;
 cmd.AddValue ("NIX", "Toggle nix-vector routing", nix);
 cmd.Parse (argc,argv);
 if (nCN < 2)
 {
-cout << "Number of total CNs (" << nCN << ") lower than minimum of 2"
+std::cout << "Number of total CNs (" << nCN << ") lower than minimum of 2"
-<< endl;
+<< std::endl;
 return 1;
 }
-cout << "Number of CNs: " << nCN << ", LAN nodes: " << nLANClients << endl;
+std::cout << "Number of CNs: " << nCN << ", LAN nodes: " << nLANClients << std::endl;
 Array2D<NodeContainer> nodes_net0(nCN, 3);
 Array2D<NodeContainer> nodes_net1(nCN, 6);
 NodeContainer* nodes_netLR = new NodeContainer[nCN];
 Array2D<NodeContainer> nodes_net2(nCN, 14);
 }
 // Create Campus Networks
 for (int z = 0; z < nCN; ++z)
 {
-cout << "Creating Campus Network " << z << ":" << endl;
+std::cout << "Creating Campus Network " << z << ":" << std::endl;
 // Create Net0
-cout << "  SubNet [ 0";
+std::cout << "  SubNet [ 0";
 for (int i = 0; i < 3; ++i)
 {
 nodes_net0[z][i].Create (1);
 stack.Install (nodes_net0[z][i]);
 }
 for (int i = 0; i < 3; ++i)
 {
 ndc0[i] = p2p_1gb5ms.Install (nodes_net0[z][i]);
 }
 // Create Net1
-cout << " 1";
+std::cout << " 1";
 for (int i = 0; i < 6; ++i)
 {
 nodes_net1[z][i].Create (1);
 stack.Install (nodes_net1[z][i]);
 }
 oss.str ("");
 oss << 10 + z << ".1.252.0";
 address.SetBase (oss.str ().c_str (), "255.255.255.0");
 ifs = address.Assign (ndc0_1);
 // Create Net2
-cout << " 2";
+std::cout << " 2";
 for (int i = 0; i < 14; ++i)
 {
 nodes_net2[z][i].Create (1);
 stack.Install (nodes_net2[z][i]);
 }
 ndc2LAN[i][j] = p2p_100mb1ms.Install (nodes_net2LAN[z][i][j]);
 ifs2LAN[z][i][j] = address.Assign (ndc2LAN[i][j]);
 }
 }
 // Create Net3
-cout << " 3 ]" << endl;
+std::cout << " 3 ]" << std::endl;
 for (int i = 0; i < 9; ++i)
 {
 nodes_net3[z][i].Create (1);
 stack.Install (nodes_net3[z][i]);
 }
 nodes_net3LAN[z][i][j].Add (nodes_net3[z][i+4].Get (0));
 ndc3LAN[i][j] = p2p_100mb1ms.Install (nodes_net3LAN[z][i][j]);
 ifs3LAN[z][i][j] = address.Assign (ndc3LAN[i][j]);
 }
 }
-cout << "  Connecting Subnets..." << endl;
+std::cout << "  Connecting Subnets..." << std::endl;
 // Create Lone Routers (Node 4 & 5)
 nodes_netLR[z].Create (2);
 stack.Install (nodes_netLR[z]);
 NetDeviceContainer ndcLR;
 ndcLR = p2p_1gb5ms.Install (nodes_netLR[z]);
 oss.str ("");
 oss << 10 + z << ".5.254.0";
 address.SetBase (oss.str ().c_str (), "255.255.255.0");
 ifs = address.Assign (ndc3_5b);
 // Assign IP addresses
-cout << "  Assigning IP addresses..." << endl;
+std::cout << "  Assigning IP addresses..." << std::endl;
 for (int i = 0; i < 3; ++i)
 {
 oss.str ("");
 oss << 10 + z << ".1." << 1 + i << ".0";
 address.SetBase (oss.str ().c_str (), "255.255.255.0");
 }
 }
 // Create Ring Links
 if (nCN > 1)
 {
-cout << "Forming Ring Topology..." << endl;
+std::cout << "Forming Ring Topology..." << std::endl;
 NodeContainer* nodes_ring = new NodeContainer[nCN];
 for (int z = 0; z < nCN-1; ++z)
 {
 nodes_ring[z].Add (nodes_net0[z][0].Get (0));
 nodes_ring[z].Add (nodes_net0[z+1][0].Get (0));
 delete[] ndc_ring;
 delete[] nodes_ring;
 }
 // Create Traffic Flows
-cout << "Creating TCP Traffic Flows:" << endl;
+std::cout << "Creating TCP Traffic Flows:" << std::endl;
 Config::SetDefault ("ns3::OnOffApplication::MaxBytes", UintegerValue (500000));
 Config::SetDefault ("ns3::OnOffApplication::OnTime",
 StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"));
 Config::SetDefault ("ns3::OnOffApplication::OffTime",
 StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));
 if (z == nCN - 1)
 {
 x = 0;
 }
 // Subnet 2 LANs
-cout << "  Campus Network " << z << " Flows [ Net2 ";
+std::cout << "  Campus Network " << z << " Flows [ Net2 ";
 for (int i = 0; i < 7; ++i)
 {
 for (int j = 0; j < nLANClients; ++j)
 {
 // Sinks
 clientApp.Add (client.Install (nodes_net1[x][r1].Get (0)));
 clientApp.Start (Seconds (r2));
 }
 }
 // Subnet 3 LANs
-cout << "Net3 ]" << endl;
+std::cout << "Net3 ]" << std::endl;
 for (int i = 0; i < 5; ++i)
 {
 for (int j = 0; j < nLANClients; ++j)
 {
 // Sinks
 clientApp.Start (Seconds (r2));
 }
 }
 }
-cout << "Created " << NodeList::GetNNodes () << " nodes." << endl;
+std::cout << "Created " << NodeList::GetNNodes () << " nodes." << std::endl;
 TIMER_TYPE routingStart;
 TIMER_NOW (routingStart);
 if (nix)
 {
 // Calculate routing tables
-cout << "Using Nix-vectors..." << endl;
+std::cout << "Using Nix-vectors..." << std::endl;
 }
 else
 {
 // Calculate routing tables
-cout << "Populating Global Static Routing Tables..." << endl;
+std::cout << "Populating Global Static Routing Tables..." << std::endl;
 Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
 }
 TIMER_TYPE routingEnd;
 TIMER_NOW (routingEnd);
-cout << "Routing tables population took "
+std::cout << "Routing tables population took "
-<< TIMER_DIFF (routingEnd, routingStart) << endl;
+<< TIMER_DIFF (routingEnd, routingStart) << std::endl;
 Simulator::ScheduleNow (Progress);
-cout << "Running simulator..." << endl;
+std::cout << "Running simulator..." << std::endl;
 TIMER_NOW (t1);
 Simulator::Stop (Seconds (100.0));
 Simulator::Run ();
 TIMER_NOW (t2);
-cout << "Simulator finished." << endl;
+std::cout << "Simulator finished." << std::endl;
 Simulator::Destroy ();
 double d1 = TIMER_DIFF (t1, t0), d2 = TIMER_DIFF (t2, t1);
-cout << "-----" << endl << "Runtime Stats:" << endl;
+std::cout << "-----" << std::endl << "Runtime Stats:" << std::endl;
-cout << "Simulator init time: " << d1 << endl;
+std::cout << "Simulator init time: " << d1 << std::endl;
-cout << "Simulator run time: " << d2 << endl;
+std::cout << "Simulator run time: " << d2 << std::endl;
-cout << "Total elapsed time: " << d1+d2 << endl;
+std::cout << "Total elapsed time: " << d1+d2 << std::endl;
 delete[] nodes_netLR;
 return 0;
 }

changeset 9063	32755d0516f4
parent 8997	9222fc5291ca
child 11775	51b05c86d144