src: Updating code style to conform (more or less) to ndn-cxx style
Also, adding .clang-format that describes the applied style. Note that
this style requires a slightly customized version of clang-format.
diff --git a/examples/ndn-tree-tracers.cpp b/examples/ndn-tree-tracers.cpp
index aeb65f9..29772f7 100644
--- a/examples/ndn-tree-tracers.cpp
+++ b/examples/ndn-tree-tracers.cpp
@@ -32,21 +32,21 @@
* /------\ /------\ /------\ /------\
* |leaf-1| |leaf-2| |leaf-3| |leaf-4|
* \------/ \------/ \------/ \------/
- * ^ ^ ^ ^
+ * ^ ^ ^ ^
* | | | |
- * \ / \ /
+ * \ / \ /
* \ / \ / 10Mbps / 1ms
* \ / \ /
- * | | | |
- * v v v v
+ * | | | |
+ * v v v v
* /-------\ /-------\
* | rtr-1 | | rtr-2 |
* \-------/ \-------/
- * ^ ^
+ * ^ ^
* | |
- * \ / 10 Mpbs / 1ms
- * +--------+ +--------+
- * | |
+ * \ / 10 Mpbs / 1ms
+ * +--------+ +--------+
+ * | |
* v v
* /--------\
* | root |
@@ -59,58 +59,57 @@
*/
int
-main (int argc, char *argv[])
+main(int argc, char* argv[])
{
CommandLine cmd;
- cmd.Parse (argc, argv);
+ cmd.Parse(argc, argv);
- AnnotatedTopologyReader topologyReader ("", 1);
- topologyReader.SetFileName ("src/ndnSIM/examples/topologies/topo-tree.txt");
- topologyReader.Read ();
+ AnnotatedTopologyReader topologyReader("", 1);
+ topologyReader.SetFileName("src/ndnSIM/examples/topologies/topo-tree.txt");
+ topologyReader.Read();
// Install CCNx stack on all nodes
ndn::StackHelper ccnxHelper;
- ccnxHelper.SetForwardingStrategy ("ns3::ndn::fw::BestRoute");
- ccnxHelper.InstallAll ();
+ ccnxHelper.SetForwardingStrategy("ns3::ndn::fw::BestRoute");
+ ccnxHelper.InstallAll();
// Installing global routing interface on all nodes
ndn::GlobalRoutingHelper ccnxGlobalRoutingHelper;
- ccnxGlobalRoutingHelper.InstallAll ();
+ ccnxGlobalRoutingHelper.InstallAll();
// Getting containers for the consumer/producer
- Ptr<Node> consumers[4] = { Names::Find<Node> ("leaf-1"), Names::Find<Node> ("leaf-2"),
- Names::Find<Node> ("leaf-3"), Names::Find<Node> ("leaf-4") };
- Ptr<Node> producer = Names::Find<Node> ("root");
+ Ptr<Node> consumers[4] = {Names::Find<Node>("leaf-1"), Names::Find<Node>("leaf-2"),
+ Names::Find<Node>("leaf-3"), Names::Find<Node>("leaf-4")};
+ Ptr<Node> producer = Names::Find<Node>("root");
- for (int i = 0; i < 4; i++)
- {
- ndn::AppHelper consumerHelper ("ns3::ndn::ConsumerCbr");
- consumerHelper.SetAttribute ("Frequency", StringValue ("100")); // 100 interests a second
+ for (int i = 0; i < 4; i++) {
+ ndn::AppHelper consumerHelper("ns3::ndn::ConsumerCbr");
+ consumerHelper.SetAttribute("Frequency", StringValue("100")); // 100 interests a second
- // Each consumer will express unique interests /root/<leaf-name>/<seq-no>
- consumerHelper.SetPrefix ("/root/" + Names::FindName (consumers[i]));
- consumerHelper.Install (consumers[i]);
- }
-
- ndn::AppHelper producerHelper ("ns3::ndn::Producer");
- producerHelper.SetAttribute ("PayloadSize", StringValue("1024"));
+ // Each consumer will express unique interests /root/<leaf-name>/<seq-no>
+ consumerHelper.SetPrefix("/root/" + Names::FindName(consumers[i]));
+ consumerHelper.Install(consumers[i]);
+ }
+
+ ndn::AppHelper producerHelper("ns3::ndn::Producer");
+ producerHelper.SetAttribute("PayloadSize", StringValue("1024"));
// Register /root prefix with global routing controller and
// install producer that will satisfy Interests in /root namespace
- ccnxGlobalRoutingHelper.AddOrigins ("/root", producer);
- producerHelper.SetPrefix ("/root");
- producerHelper.Install (producer);
+ ccnxGlobalRoutingHelper.AddOrigins("/root", producer);
+ producerHelper.SetPrefix("/root");
+ producerHelper.Install(producer);
// Calculate and install FIBs
- ccnxGlobalRoutingHelper.CalculateRoutes ();
+ ccnxGlobalRoutingHelper.CalculateRoutes();
- Simulator::Stop (Seconds (20.0));
+ Simulator::Stop(Seconds(20.0));
- ndn::L3AggregateTracer::InstallAll ("aggregate-trace.txt", Seconds (0.5));
- ndn::L3RateTracer::InstallAll ("rate-trace.txt", Seconds (0.5));
-
- Simulator::Run ();
- Simulator::Destroy ();
+ ndn::L3AggregateTracer::InstallAll("aggregate-trace.txt", Seconds(0.5));
+ ndn::L3RateTracer::InstallAll("rate-trace.txt", Seconds(0.5));
+
+ Simulator::Run();
+ Simulator::Destroy();
return 0;
}