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/model/cs/custom-policies/freshness-policy.hpp b/model/cs/custom-policies/freshness-policy.hpp
index b85635e..999c61d 100644
--- a/model/cs/custom-policies/freshness-policy.hpp
+++ b/model/cs/custom-policies/freshness-policy.hpp
@@ -35,126 +35,127 @@
/**
* @brief Traits for freshness policy
*/
-struct freshness_policy_traits
-{
+struct freshness_policy_traits {
/// @brief Name that can be used to identify the policy (for NS-3 object model and logging)
- static std::string GetName () { return "Freshness"; }
-
- struct policy_hook_type : public boost::intrusive::set_member_hook<> { Time timeWhenShouldExpire; };
-
- template<class Container>
- struct container_hook
+ static std::string
+ GetName()
{
- typedef boost::intrusive::member_hook< Container,
- policy_hook_type,
- &Container::policy_hook_ > type;
+ return "Freshness";
+ }
+
+ struct policy_hook_type : public boost::intrusive::set_member_hook<> {
+ Time timeWhenShouldExpire;
};
- template<class Base,
- class Container,
- class Hook>
- struct policy
- {
- static Time& get_freshness (typename Container::iterator item)
+ template<class Container>
+ struct container_hook {
+ typedef boost::intrusive::member_hook<Container, policy_hook_type, &Container::policy_hook_>
+ type;
+ };
+
+ template<class Base, class Container, class Hook>
+ struct policy {
+ static Time&
+ get_freshness(typename Container::iterator item)
{
- return static_cast<typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->timeWhenShouldExpire;
+ return static_cast<typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->timeWhenShouldExpire;
}
- static const Time& get_freshness (typename Container::const_iterator item)
+ static const Time&
+ get_freshness(typename Container::const_iterator item)
{
- return static_cast<const typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->timeWhenShouldExpire;
+ return static_cast<const typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->timeWhenShouldExpire;
}
template<class Key>
- struct MemberHookLess
- {
- bool operator () (const Key &a, const Key &b) const
+ struct MemberHookLess {
+ bool
+ operator()(const Key& a, const Key& b) const
{
- return get_freshness (&a) < get_freshness (&b);
+ return get_freshness(&a) < get_freshness(&b);
}
};
- typedef boost::intrusive::multiset< Container,
- boost::intrusive::compare< MemberHookLess< Container > >,
- Hook > policy_container;
+ typedef boost::intrusive::multiset<Container,
+ boost::intrusive::compare<MemberHookLess<Container>>,
+ Hook> policy_container;
-
- class type : public policy_container
- {
+ class type : public policy_container {
public:
typedef policy policy_base; // to get access to get_freshness methods from outside
typedef Container parent_trie;
- type (Base &base)
- : base_ (base)
- , max_size_ (100)
+ type(Base& base)
+ : base_(base)
+ , max_size_(100)
{
}
inline void
- update (typename parent_trie::iterator item)
+ update(typename parent_trie::iterator item)
{
// do nothing
}
inline bool
- insert (typename parent_trie::iterator item)
+ insert(typename parent_trie::iterator item)
{
// get_time (item) = Simulator::Now ();
- Time freshness = item->payload ()->GetData ()->GetFreshness ();
- if (!freshness.IsZero ())
- {
- get_freshness (item) = Simulator::Now () + freshness;
+ Time freshness = item->payload()->GetData()->GetFreshness();
+ if (!freshness.IsZero()) {
+ get_freshness(item) = Simulator::Now() + freshness;
- // push item only if freshness is non zero. otherwise, this payload is not controlled by the policy
- // note that .size() on this policy would return only number of items with non-infinite freshness policy
- policy_container::insert (*item);
- }
+ // push item only if freshness is non zero. otherwise, this payload is not controlled by
+ // the policy
+ // note that .size() on this policy would return only number of items with non-infinite
+ // freshness policy
+ policy_container::insert(*item);
+ }
return true;
}
inline void
- lookup (typename parent_trie::iterator item)
+ lookup(typename parent_trie::iterator item)
{
// do nothing. it's random policy
}
inline void
- erase (typename parent_trie::iterator item)
+ erase(typename parent_trie::iterator item)
{
- if (!item->payload ()->GetData ()->GetFreshness ().IsZero ())
- {
- // erase only if freshness is non zero (otherwise an item is not in the policy
- policy_container::erase (policy_container::s_iterator_to (*item));
- }
+ if (!item->payload()->GetData()->GetFreshness().IsZero()) {
+ // erase only if freshness is non zero (otherwise an item is not in the policy
+ policy_container::erase(policy_container::s_iterator_to(*item));
+ }
}
inline void
- clear ()
+ clear()
{
- policy_container::clear ();
+ policy_container::clear();
}
inline void
- set_max_size (size_t max_size)
+ set_max_size(size_t max_size)
{
max_size_ = max_size;
}
inline size_t
- get_max_size () const
+ get_max_size() const
{
return max_size_;
}
private:
- type () : base_(*((Base*)0)) { };
+ type()
+ : base_(*((Base*)0)){};
private:
- Base &base_;
+ Base& base_;
size_t max_size_;
};
};
diff --git a/model/cs/custom-policies/lifetime-stats-policy.hpp b/model/cs/custom-policies/lifetime-stats-policy.hpp
index 905f532..1102ef1 100644
--- a/model/cs/custom-policies/lifetime-stats-policy.hpp
+++ b/model/cs/custom-policies/lifetime-stats-policy.hpp
@@ -35,119 +35,122 @@
/**
* @brief Traits for lifetime stats policy
*/
-struct lifetime_stats_policy_traits
-{
+struct lifetime_stats_policy_traits {
/// @brief Name that can be used to identify the policy (for NS-3 object model and logging)
- static std::string GetName () { return "LifetimeStats"; }
-
- struct policy_hook_type : public boost::intrusive::list_member_hook<> { Time timeWhenAdded; };
-
- template<class Container>
- struct container_hook
+ static std::string
+ GetName()
{
- typedef boost::intrusive::member_hook< Container,
- policy_hook_type,
- &Container::policy_hook_ > type;
+ return "LifetimeStats";
+ }
+
+ struct policy_hook_type : public boost::intrusive::list_member_hook<> {
+ Time timeWhenAdded;
};
- template<class Base,
- class Container,
- class Hook>
- struct policy
- {
- typedef typename boost::intrusive::list< Container, Hook > policy_container;
-
- static Time& get_time (typename Container::iterator item)
+ template<class Container>
+ struct container_hook {
+ typedef boost::intrusive::member_hook<Container, policy_hook_type, &Container::policy_hook_>
+ type;
+ };
+
+ template<class Base, class Container, class Hook>
+ struct policy {
+ typedef typename boost::intrusive::list<Container, Hook> policy_container;
+
+ static Time&
+ get_time(typename Container::iterator item)
{
- return static_cast<typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->timeWhenAdded;
- }
-
- static const Time& get_time (typename Container::const_iterator item)
- {
- return static_cast<const typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->timeWhenAdded;
+ return static_cast<typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->timeWhenAdded;
}
- class type : public policy_container
+ static const Time&
+ get_time(typename Container::const_iterator item)
{
+ return static_cast<const typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->timeWhenAdded;
+ }
+
+ class type : public policy_container {
public:
typedef policy policy_base; // to get access to get_time methods from outside
typedef Container parent_trie;
- type (Base &base)
- : base_ (base)
- , max_size_ (100)
- , m_willRemoveEntry (0)
+ type(Base& base)
+ : base_(base)
+ , max_size_(100)
+ , m_willRemoveEntry(0)
{
}
inline void
- update (typename parent_trie::iterator item)
+ update(typename parent_trie::iterator item)
{
// do nothing. it's random policy
}
-
- inline bool
- insert (typename parent_trie::iterator item)
- {
- get_time (item) = Simulator::Now ();
- policy_container::push_back (*item);
+ inline bool
+ insert(typename parent_trie::iterator item)
+ {
+ get_time(item) = Simulator::Now();
+
+ policy_container::push_back(*item);
return true;
}
-
+
inline void
- lookup (typename parent_trie::iterator item)
+ lookup(typename parent_trie::iterator item)
{
// do nothing. it's random policy
}
-
- inline void
- erase (typename parent_trie::iterator item)
- {
- Time lifetime = Simulator::Now () - get_time (item);
- if (m_willRemoveEntry != 0)
- {
- (*m_willRemoveEntry) (item->payload (), lifetime);
- }
-
- policy_container::erase (policy_container::s_iterator_to (*item));
+ inline void
+ erase(typename parent_trie::iterator item)
+ {
+ Time lifetime = Simulator::Now() - get_time(item);
+
+ if (m_willRemoveEntry != 0) {
+ (*m_willRemoveEntry)(item->payload(), lifetime);
+ }
+
+ policy_container::erase(policy_container::s_iterator_to(*item));
}
inline void
- clear ()
+ clear()
{
- policy_container::clear ();
+ policy_container::clear();
}
inline void
- set_max_size (size_t max_size)
+ set_max_size(size_t max_size)
{
max_size_ = max_size;
}
inline size_t
- get_max_size () const
+ get_max_size() const
{
return max_size_;
}
void
- set_traced_callback (TracedCallback< typename parent_trie::payload_traits::const_base_type, Time > *callback)
+ set_traced_callback(
+ TracedCallback<typename parent_trie::payload_traits::const_base_type, Time>* callback)
{
m_willRemoveEntry = callback;
}
-
+
private:
- type () : base_(*((Base*)0)) { };
-
+ type()
+ : base_(*((Base*)0)){};
+
private:
- Base &base_;
+ Base& base_;
size_t max_size_;
- TracedCallback< typename parent_trie::payload_traits::const_base_type, Time > *m_willRemoveEntry;
+ TracedCallback<typename parent_trie::payload_traits::const_base_type, Time>*
+ m_willRemoveEntry;
};
};
};
diff --git a/model/cs/custom-policies/probability-policy.hpp b/model/cs/custom-policies/probability-policy.hpp
index 0c3088c..57d6835 100644
--- a/model/cs/custom-policies/probability-policy.hpp
+++ b/model/cs/custom-policies/probability-policy.hpp
@@ -33,109 +33,106 @@
/**
* @brief Traits for freshness policy
*/
-struct probability_policy_traits
-{
- static std::string GetName () { return "ProbabilityImpl"; }
-
- struct policy_hook_type : public boost::intrusive::list_member_hook<> {};
-
- template<class Container>
- struct container_hook
+struct probability_policy_traits {
+ static std::string
+ GetName()
{
- typedef boost::intrusive::member_hook< Container,
- policy_hook_type,
- &Container::policy_hook_ > type;
+ return "ProbabilityImpl";
+ }
+
+ struct policy_hook_type : public boost::intrusive::list_member_hook<> {
};
- template<class Base,
- class Container,
- class Hook>
- struct policy
- {
- typedef typename boost::intrusive::list< Container, Hook > policy_container;
-
- class type : public policy_container
- {
+ template<class Container>
+ struct container_hook {
+ typedef boost::intrusive::member_hook<Container, policy_hook_type, &Container::policy_hook_>
+ type;
+ };
+
+ template<class Base, class Container, class Hook>
+ struct policy {
+ typedef typename boost::intrusive::list<Container, Hook> policy_container;
+
+ class type : public policy_container {
public:
typedef policy policy_base; // to get access to get_freshness methods from outside
typedef Container parent_trie;
- type (Base &base)
- : base_ (base)
- , max_size_ (100)
- , probability_ (1.0)
+ type(Base& base)
+ : base_(base)
+ , max_size_(100)
+ , probability_(1.0)
{
}
inline void
- update (typename parent_trie::iterator item)
+ update(typename parent_trie::iterator item)
{
}
inline bool
- insert (typename parent_trie::iterator item)
+ insert(typename parent_trie::iterator item)
{
- if (ns3_rand_.GetValue () < probability_)
- {
- policy_container::push_back (*item);
+ if (ns3_rand_.GetValue() < probability_) {
+ policy_container::push_back(*item);
- // allow caching
- return true;
- }
- else
- {
- // don't allow caching
- return false;
- }
+ // allow caching
+ return true;
+ }
+ else {
+ // don't allow caching
+ return false;
+ }
}
inline void
- lookup (typename parent_trie::iterator item)
+ lookup(typename parent_trie::iterator item)
{
// do nothing. it's random policy
}
inline void
- erase (typename parent_trie::iterator item)
+ erase(typename parent_trie::iterator item)
{
- policy_container::erase (policy_container::s_iterator_to (*item));
+ policy_container::erase(policy_container::s_iterator_to(*item));
}
inline void
- clear ()
+ clear()
{
- policy_container::clear ();
+ policy_container::clear();
}
inline void
- set_max_size (size_t max_size)
+ set_max_size(size_t max_size)
{
max_size_ = max_size;
}
inline size_t
- get_max_size () const
+ get_max_size() const
{
return max_size_;
}
inline void
- set_probability (double probability)
+ set_probability(double probability)
{
probability_ = probability;
}
inline double
- get_probability () const
+ get_probability() const
{
return probability_;
- }
+ }
private:
- type () : base_(*((Base*)0)) { };
+ type()
+ : base_(*((Base*)0)){};
private:
- Base &base_;
+ Base& base_;
size_t max_size_;
double probability_;
UniformVariable ns3_rand_;