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/apps/ndn-consumer-zipf-mandelbrot.cpp b/apps/ndn-consumer-zipf-mandelbrot.cpp
index a88befb..806b8e3 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cpp
+++ b/apps/ndn-consumer-zipf-mandelbrot.cpp
@@ -28,47 +28,45 @@
#include <math.h>
-
-NS_LOG_COMPONENT_DEFINE ("ndn.ConsumerZipfMandelbrot");
+NS_LOG_COMPONENT_DEFINE("ndn.ConsumerZipfMandelbrot");
namespace ns3 {
namespace ndn {
-NS_OBJECT_ENSURE_REGISTERED (ConsumerZipfMandelbrot);
+NS_OBJECT_ENSURE_REGISTERED(ConsumerZipfMandelbrot);
TypeId
-ConsumerZipfMandelbrot::GetTypeId (void)
+ConsumerZipfMandelbrot::GetTypeId(void)
{
- static TypeId tid = TypeId ("ns3::ndn::ConsumerZipfMandelbrot")
- .SetGroupName ("Ndn")
- .SetParent<ConsumerCbr> ()
- .AddConstructor<ConsumerZipfMandelbrot> ()
+ static TypeId tid =
+ TypeId("ns3::ndn::ConsumerZipfMandelbrot")
+ .SetGroupName("Ndn")
+ .SetParent<ConsumerCbr>()
+ .AddConstructor<ConsumerZipfMandelbrot>()
- .AddAttribute ("NumberOfContents", "Number of the Contents in total",
- StringValue ("100"),
- MakeUintegerAccessor (&ConsumerZipfMandelbrot::SetNumberOfContents, &ConsumerZipfMandelbrot::GetNumberOfContents),
- MakeUintegerChecker<uint32_t> ())
+ .AddAttribute("NumberOfContents", "Number of the Contents in total", StringValue("100"),
+ MakeUintegerAccessor(&ConsumerZipfMandelbrot::SetNumberOfContents,
+ &ConsumerZipfMandelbrot::GetNumberOfContents),
+ MakeUintegerChecker<uint32_t>())
- .AddAttribute ("q", "parameter of improve rank",
- StringValue ("0.7"),
- MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetQ, &ConsumerZipfMandelbrot::GetQ),
- MakeDoubleChecker<double> ())
-
- .AddAttribute ("s", "parameter of power",
- StringValue ("0.7"),
- MakeDoubleAccessor (&ConsumerZipfMandelbrot::SetS, &ConsumerZipfMandelbrot::GetS),
- MakeDoubleChecker<double> ())
- ;
+ .AddAttribute("q", "parameter of improve rank", StringValue("0.7"),
+ MakeDoubleAccessor(&ConsumerZipfMandelbrot::SetQ,
+ &ConsumerZipfMandelbrot::GetQ),
+ MakeDoubleChecker<double>())
+
+ .AddAttribute("s", "parameter of power", StringValue("0.7"),
+ MakeDoubleAccessor(&ConsumerZipfMandelbrot::SetS,
+ &ConsumerZipfMandelbrot::GetS),
+ MakeDoubleChecker<double>());
return tid;
}
-
ConsumerZipfMandelbrot::ConsumerZipfMandelbrot()
- : m_N (100) // needed here to make sure when SetQ/SetS are called, there is a valid value of N
- , m_q (0.7)
- , m_s (0.7)
- , m_SeqRng (0.0, 1.0)
+ : m_N(100) // needed here to make sure when SetQ/SetS are called, there is a valid value of N
+ , m_q(0.7)
+ , m_s(0.7)
+ , m_SeqRng(0.0, 1.0)
{
// SetNumberOfContents is called by NS-3 object system during the initialization
}
@@ -78,135 +76,133 @@
}
void
-ConsumerZipfMandelbrot::SetNumberOfContents (uint32_t numOfContents)
+ConsumerZipfMandelbrot::SetNumberOfContents(uint32_t numOfContents)
{
m_N = numOfContents;
- NS_LOG_DEBUG (m_q << " and " << m_s << " and " << m_N);
+ NS_LOG_DEBUG(m_q << " and " << m_s << " and " << m_N);
- m_Pcum = std::vector<double> (m_N + 1);
+ m_Pcum = std::vector<double>(m_N + 1);
m_Pcum[0] = 0.0;
- for (uint32_t i=1; i<=m_N; i++)
- {
- m_Pcum[i] = m_Pcum[i-1] + 1.0 / std::pow(i+m_q, m_s);
- }
+ for (uint32_t i = 1; i <= m_N; i++) {
+ m_Pcum[i] = m_Pcum[i - 1] + 1.0 / std::pow(i + m_q, m_s);
+ }
- for (uint32_t i=1; i<=m_N; i++)
- {
- m_Pcum[i] = m_Pcum[i] / m_Pcum[m_N];
- NS_LOG_LOGIC ("Cumulative probability [" << i << "]=" << m_Pcum[i]);
+ for (uint32_t i = 1; i <= m_N; i++) {
+ m_Pcum[i] = m_Pcum[i] / m_Pcum[m_N];
+ NS_LOG_LOGIC("Cumulative probability [" << i << "]=" << m_Pcum[i]);
}
}
uint32_t
-ConsumerZipfMandelbrot::GetNumberOfContents () const
+ConsumerZipfMandelbrot::GetNumberOfContents() const
{
return m_N;
}
void
-ConsumerZipfMandelbrot::SetQ (double q)
+ConsumerZipfMandelbrot::SetQ(double q)
{
m_q = q;
- SetNumberOfContents (m_N);
+ SetNumberOfContents(m_N);
}
double
-ConsumerZipfMandelbrot::GetQ () const
+ConsumerZipfMandelbrot::GetQ() const
{
return m_q;
}
void
-ConsumerZipfMandelbrot::SetS (double s)
+ConsumerZipfMandelbrot::SetS(double s)
{
m_s = s;
- SetNumberOfContents (m_N);
+ SetNumberOfContents(m_N);
}
double
-ConsumerZipfMandelbrot::GetS () const
+ConsumerZipfMandelbrot::GetS() const
{
return m_s;
}
void
-ConsumerZipfMandelbrot::SendPacket() {
- if (!m_active) return;
+ConsumerZipfMandelbrot::SendPacket()
+{
+ if (!m_active)
+ return;
- NS_LOG_FUNCTION_NOARGS ();
+ NS_LOG_FUNCTION_NOARGS();
- uint32_t seq=std::numeric_limits<uint32_t>::max (); //invalid
+ uint32_t seq = std::numeric_limits<uint32_t>::max(); // invalid
// std::cout << Simulator::Now ().ToDouble (Time::S) << "s max -> " << m_seqMax << "\n";
- while (m_retxSeqs.size ())
- {
- seq = *m_retxSeqs.begin ();
- m_retxSeqs.erase (m_retxSeqs.begin ());
+ while (m_retxSeqs.size()) {
+ seq = *m_retxSeqs.begin();
+ m_retxSeqs.erase(m_retxSeqs.begin());
- // NS_ASSERT (m_seqLifetimes.find (seq) != m_seqLifetimes.end ());
- // if (m_seqLifetimes.find (seq)->time <= Simulator::Now ())
- // {
+ // NS_ASSERT (m_seqLifetimes.find (seq) != m_seqLifetimes.end ());
+ // if (m_seqLifetimes.find (seq)->time <= Simulator::Now ())
+ // {
- // NS_LOG_DEBUG ("Expire " << seq);
- // m_seqLifetimes.erase (seq); // lifetime expired. Trying to find another unexpired sequence number
- // continue;
- // }
- NS_LOG_DEBUG("=interest seq "<<seq<<" from m_retxSeqs");
- break;
+ // NS_LOG_DEBUG ("Expire " << seq);
+ // m_seqLifetimes.erase (seq); // lifetime expired. Trying to find another unexpired
+ // sequence number
+ // continue;
+ // }
+ NS_LOG_DEBUG("=interest seq " << seq << " from m_retxSeqs");
+ break;
+ }
+
+ if (seq == std::numeric_limits<uint32_t>::max()) // no retransmission
+ {
+ if (m_seqMax != std::numeric_limits<uint32_t>::max()) {
+ if (m_seq >= m_seqMax) {
+ return; // we are totally done
+ }
}
- if (seq == std::numeric_limits<uint32_t>::max ()) //no retransmission
- {
- if (m_seqMax != std::numeric_limits<uint32_t>::max ())
- {
- if (m_seq >= m_seqMax)
- {
- return; // we are totally done
- }
- }
-
- seq = ConsumerZipfMandelbrot::GetNextSeq();
- m_seq ++;
- }
+ seq = ConsumerZipfMandelbrot::GetNextSeq();
+ m_seq++;
+ }
// std::cout << Simulator::Now ().ToDouble (Time::S) << "s -> " << seq << "\n";
//
- Ptr<Name> nameWithSequence = Create<Name> (m_interestName);
- nameWithSequence->appendSeqNum (seq);
+ Ptr<Name> nameWithSequence = Create<Name>(m_interestName);
+ nameWithSequence->appendSeqNum(seq);
//
- Ptr<Interest> interest = Create<Interest> ();
- interest->SetNonce (m_rand.GetValue ());
- interest->SetName (nameWithSequence);
+ Ptr<Interest> interest = Create<Interest>();
+ interest->SetNonce(m_rand.GetValue());
+ interest->SetName(nameWithSequence);
// NS_LOG_INFO ("Requesting Interest: \n" << *interest);
- NS_LOG_INFO ("> Interest for " << seq<<", Total: "<<m_seq<<", face: "<<m_face->GetId());
- NS_LOG_DEBUG ("Trying to add " << seq << " with " << Simulator::Now () << ". already " << m_seqTimeouts.size () << " items");
+ NS_LOG_INFO("> Interest for " << seq << ", Total: " << m_seq << ", face: " << m_face->GetId());
+ NS_LOG_DEBUG("Trying to add " << seq << " with " << Simulator::Now() << ". already "
+ << m_seqTimeouts.size() << " items");
- m_seqTimeouts.insert (SeqTimeout (seq, Simulator::Now ()));
- m_seqFullDelay.insert (SeqTimeout (seq, Simulator::Now ()));
+ m_seqTimeouts.insert(SeqTimeout(seq, Simulator::Now()));
+ m_seqFullDelay.insert(SeqTimeout(seq, Simulator::Now()));
- m_seqLastDelay.erase (seq);
- m_seqLastDelay.insert (SeqTimeout (seq, Simulator::Now ()));
+ m_seqLastDelay.erase(seq);
+ m_seqLastDelay.insert(SeqTimeout(seq, Simulator::Now()));
- m_seqRetxCounts[seq] ++;
+ m_seqRetxCounts[seq]++;
- m_rtt->SentSeq (SequenceNumber32 (seq), 1);
+ m_rtt->SentSeq(SequenceNumber32(seq), 1);
FwHopCountTag hopCountTag;
- interest->GetPayload ()->AddPacketTag (hopCountTag);
+ interest->GetPayload()->AddPacketTag(hopCountTag);
- m_transmittedInterests (interest, this, m_face);
- m_face->ReceiveInterest (interest);
+ m_transmittedInterests(interest, this, m_face);
+ m_face->ReceiveInterest(interest);
- ConsumerZipfMandelbrot::ScheduleNextPacket ();
+ ConsumerZipfMandelbrot::ScheduleNextPacket();
}
-
uint32_t
ConsumerZipfMandelbrot::GetNextSeq()
{
@@ -214,42 +210,36 @@
double p_sum = 0;
double p_random = m_SeqRng.GetValue();
- while (p_random == 0)
- {
- p_random = m_SeqRng.GetValue();
- }
- //if (p_random == 0)
- NS_LOG_LOGIC("p_random="<<p_random);
- for (uint32_t i=1; i<=m_N; i++)
- {
- p_sum = m_Pcum[i]; //m_Pcum[i] = m_Pcum[i-1] + p[i], p[0] = 0; e.g.: p_cum[1] = p[1], p_cum[2] = p[1] + p[2]
- if (p_random <= p_sum)
- {
- content_index = i;
- break;
- } //if
- } //for
- //content_index = 1;
- NS_LOG_DEBUG("RandomNumber="<<content_index);
+ while (p_random == 0) {
+ p_random = m_SeqRng.GetValue();
+ }
+ // if (p_random == 0)
+ NS_LOG_LOGIC("p_random=" << p_random);
+ for (uint32_t i = 1; i <= m_N; i++) {
+ p_sum = m_Pcum[i]; // m_Pcum[i] = m_Pcum[i-1] + p[i], p[0] = 0; e.g.: p_cum[1] = p[1],
+ // p_cum[2] = p[1] + p[2]
+ if (p_random <= p_sum) {
+ content_index = i;
+ break;
+ } // if
+ } // for
+ // content_index = 1;
+ NS_LOG_DEBUG("RandomNumber=" << content_index);
return content_index;
}
void
-ConsumerZipfMandelbrot::ScheduleNextPacket() {
+ConsumerZipfMandelbrot::ScheduleNextPacket()
+{
- if (m_firstTime)
- {
- m_sendEvent = Simulator::Schedule (Seconds (0.0),
- &ConsumerZipfMandelbrot::SendPacket, this);
- m_firstTime = false;
- }
- else if (!m_sendEvent.IsRunning ())
- m_sendEvent = Simulator::Schedule (
- (m_random == 0) ?
- Seconds(1.0 / m_frequency)
- :
- Seconds(m_random->GetValue ()),
- &ConsumerZipfMandelbrot::SendPacket, this);
+ if (m_firstTime) {
+ m_sendEvent = Simulator::Schedule(Seconds(0.0), &ConsumerZipfMandelbrot::SendPacket, this);
+ m_firstTime = false;
+ }
+ else if (!m_sendEvent.IsRunning())
+ m_sendEvent = Simulator::Schedule((m_random == 0) ? Seconds(1.0 / m_frequency)
+ : Seconds(m_random->GetValue()),
+ &ConsumerZipfMandelbrot::SendPacket, this);
}
} /* namespace ndn */