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/utils/ndn-rtt-mean-deviation.cpp b/utils/ndn-rtt-mean-deviation.cpp
index 8e99069..c6c7218 100644
--- a/utils/ndn-rtt-mean-deviation.cpp
+++ b/utils/ndn-rtt-mean-deviation.cpp
@@ -32,7 +32,7 @@
#include "ns3/uinteger.h"
#include "ns3/log.h"
-NS_LOG_COMPONENT_DEFINE ("ndn.RttMeanDeviation");
+NS_LOG_COMPONENT_DEFINE("ndn.RttMeanDeviation");
namespace ns3 {
namespace ndn {
@@ -40,143 +40,147 @@
//---------------------------------------------------------------------------------
// A modified version of Mean-Deviation Estimator optimized for NDN packet delivery
-NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation);
+NS_OBJECT_ENSURE_REGISTERED(RttMeanDeviation);
TypeId
-RttMeanDeviation::GetTypeId (void)
+RttMeanDeviation::GetTypeId(void)
{
- static TypeId tid = TypeId ("ns3::ndn::RttMeanDeviation")
- .SetParent<RttEstimator> ()
- .AddConstructor<RttMeanDeviation> ()
- .AddAttribute ("Gain",
- "Gain used in estimating the RTT (smoothed RTT), must be 0 < Gain < 1",
- DoubleValue (0.125),
- MakeDoubleAccessor (&RttMeanDeviation::m_gain),
- MakeDoubleChecker<double> ())
- .AddAttribute ("Gain2",
- "Gain2 used in estimating the RTT (variance), must be 0 < Gain2 < 1",
- DoubleValue (0.25),
- MakeDoubleAccessor (&RttMeanDeviation::m_gain2),
- MakeDoubleChecker<double> ())
- ;
+ static TypeId tid =
+ TypeId("ns3::ndn::RttMeanDeviation")
+ .SetParent<RttEstimator>()
+ .AddConstructor<RttMeanDeviation>()
+ .AddAttribute("Gain", "Gain used in estimating the RTT (smoothed RTT), must be 0 < Gain < 1",
+ DoubleValue(0.125), MakeDoubleAccessor(&RttMeanDeviation::m_gain),
+ MakeDoubleChecker<double>())
+ .AddAttribute("Gain2", "Gain2 used in estimating the RTT (variance), must be 0 < Gain2 < 1",
+ DoubleValue(0.25), MakeDoubleAccessor(&RttMeanDeviation::m_gain2),
+ MakeDoubleChecker<double>());
return tid;
}
-RttMeanDeviation::RttMeanDeviation() :
- m_variance (0)
+RttMeanDeviation::RttMeanDeviation()
+ : m_variance(0)
{
- NS_LOG_FUNCTION (this);
+ NS_LOG_FUNCTION(this);
}
-RttMeanDeviation::RttMeanDeviation (const RttMeanDeviation& c)
- : RttEstimator (c), m_gain (c.m_gain), m_gain2 (c.m_gain2), m_variance (c.m_variance)
+RttMeanDeviation::RttMeanDeviation(const RttMeanDeviation& c)
+ : RttEstimator(c)
+ , m_gain(c.m_gain)
+ , m_gain2(c.m_gain2)
+ , m_variance(c.m_variance)
{
- NS_LOG_FUNCTION (this);
+ NS_LOG_FUNCTION(this);
}
TypeId
-RttMeanDeviation::GetInstanceTypeId (void) const
+RttMeanDeviation::GetInstanceTypeId(void) const
{
- return GetTypeId ();
+ return GetTypeId();
}
-void RttMeanDeviation::Measurement (Time m)
+void
+RttMeanDeviation::Measurement(Time m)
{
- NS_LOG_FUNCTION (this << m);
- if (m_nSamples)
- { // Not first
- Time err (m - m_currentEstimatedRtt);
- double gErr = err.ToDouble (Time::S) * m_gain;
- m_currentEstimatedRtt += Time::FromDouble (gErr, Time::S);
- Time difference = Abs (err) - m_variance;
- NS_LOG_DEBUG ("m_variance += " << Time::FromDouble (difference.ToDouble (Time::S) * m_gain2, Time::S));
- m_variance += Time::FromDouble (difference.ToDouble (Time::S) * m_gain2, Time::S);
- }
- else
- { // First sample
- m_currentEstimatedRtt = m; // Set estimate to current
- //variance = sample / 2; // And variance to current / 2
- // m_variance = m; // try this why????
- m_variance = Seconds (m.ToDouble (Time::S) / 2);
- NS_LOG_DEBUG ("(first sample) m_variance += " << m);
- }
+ NS_LOG_FUNCTION(this << m);
+ if (m_nSamples) { // Not first
+ Time err(m - m_currentEstimatedRtt);
+ double gErr = err.ToDouble(Time::S) * m_gain;
+ m_currentEstimatedRtt += Time::FromDouble(gErr, Time::S);
+ Time difference = Abs(err) - m_variance;
+ NS_LOG_DEBUG(
+ "m_variance += " << Time::FromDouble(difference.ToDouble(Time::S) * m_gain2, Time::S));
+ m_variance += Time::FromDouble(difference.ToDouble(Time::S) * m_gain2, Time::S);
+ }
+ else { // First sample
+ m_currentEstimatedRtt = m; // Set estimate to current
+ // variance = sample / 2; // And variance to current / 2
+ // m_variance = m; // try this why????
+ m_variance = Seconds(m.ToDouble(Time::S) / 2);
+ NS_LOG_DEBUG("(first sample) m_variance += " << m);
+ }
m_nSamples++;
}
-Time RttMeanDeviation::RetransmitTimeout ()
+Time
+RttMeanDeviation::RetransmitTimeout()
{
- NS_LOG_FUNCTION (this);
+ NS_LOG_FUNCTION(this);
- double retval = std::min (m_maxRto.ToDouble (Time::S),
- std::max (m_multiplier*m_minRto.ToDouble (Time::S),
- m_multiplier*(m_currentEstimatedRtt.ToDouble (Time::S) + 4 * m_variance.ToDouble (Time::S))));
+ double retval = std::min(m_maxRto.ToDouble(Time::S),
+ std::max(m_multiplier * m_minRto.ToDouble(Time::S),
+ m_multiplier * (m_currentEstimatedRtt.ToDouble(Time::S)
+ + 4 * m_variance.ToDouble(Time::S))));
- NS_LOG_DEBUG ("RetransmitTimeout: return " << retval);
+ NS_LOG_DEBUG("RetransmitTimeout: return " << retval);
- return Seconds (retval);
+ return Seconds(retval);
}
-Ptr<RttEstimator> RttMeanDeviation::Copy () const
+Ptr<RttEstimator>
+RttMeanDeviation::Copy() const
{
- NS_LOG_FUNCTION (this);
- return CopyObject<RttMeanDeviation> (this);
+ NS_LOG_FUNCTION(this);
+ return CopyObject<RttMeanDeviation>(this);
}
-void RttMeanDeviation::Reset ()
+void
+RttMeanDeviation::Reset()
{
- NS_LOG_FUNCTION (this);
+ NS_LOG_FUNCTION(this);
// Reset to initial state
- m_variance = Seconds (0);
- RttEstimator::Reset ();
+ m_variance = Seconds(0);
+ RttEstimator::Reset();
}
-void RttMeanDeviation::Gain (double g)
+void
+RttMeanDeviation::Gain(double g)
{
- NS_LOG_FUNCTION (this);
- NS_ASSERT_MSG( (g > 0) && (g < 1), "RttMeanDeviation: Gain must be less than 1 and greater than 0" );
+ NS_LOG_FUNCTION(this);
+ NS_ASSERT_MSG((g > 0) && (g < 1),
+ "RttMeanDeviation: Gain must be less than 1 and greater than 0");
m_gain = g;
}
-void RttMeanDeviation::SentSeq (SequenceNumber32 seq, uint32_t size)
-{
- NS_LOG_FUNCTION (this << seq << size);
+void
+RttMeanDeviation::SentSeq(SequenceNumber32 seq, uint32_t size)
+{
+ NS_LOG_FUNCTION(this << seq << size);
RttHistory_t::iterator i;
- for (i = m_history.begin (); i != m_history.end (); ++i)
- {
- if (seq == i->seq)
- { // Found it
- i->retx = true;
- break;
- }
+ for (i = m_history.begin(); i != m_history.end(); ++i) {
+ if (seq == i->seq) { // Found it
+ i->retx = true;
+ break;
+ }
}
// Note that a particular sequence has been sent
if (i == m_history.end())
- m_history.push_back (RttHistory (seq, size, Simulator::Now () ));
+ m_history.push_back(RttHistory(seq, size, Simulator::Now()));
}
-Time RttMeanDeviation::AckSeq (SequenceNumber32 ackSeq)
+Time
+RttMeanDeviation::AckSeq(SequenceNumber32 ackSeq)
{
- NS_LOG_FUNCTION (this << ackSeq);
+ NS_LOG_FUNCTION(this << ackSeq);
// An ack has been received, calculate rtt and log this measurement
// Note we use a linear search (O(n)) for this since for the common
// case the ack'ed packet will be at the head of the list
- Time m = Seconds (0.0);
- if (m_history.size () == 0) return (m); // No pending history, just exit
+ Time m = Seconds(0.0);
+ if (m_history.size() == 0)
+ return (m); // No pending history, just exit
- for (RttHistory_t::iterator i = m_history.begin (); i != m_history.end (); ++i)
- {
- if (ackSeq == i->seq)
- { // Found it
- if (!i->retx) {
- m = Simulator::Now () - i->time;// Elapsed time
- Measurement (m); // Log the measurement
- ResetMultiplier (); // Reset multiplier on valid measurement
- }
- m_history.erase(i);
- break;
+ for (RttHistory_t::iterator i = m_history.begin(); i != m_history.end(); ++i) {
+ if (ackSeq == i->seq) { // Found it
+ if (!i->retx) {
+ m = Simulator::Now() - i->time; // Elapsed time
+ Measurement(m); // Log the measurement
+ ResetMultiplier(); // Reset multiplier on valid measurement
}
+ m_history.erase(i);
+ break;
+ }
}
return m;
@@ -184,4 +188,3 @@
} // namespace ndn
} // namespace ns3
-