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/trie/random-policy.hpp b/utils/trie/random-policy.hpp
index 1a7308c..7264bed 100644
--- a/utils/trie/random-policy.hpp
+++ b/utils/trie/random-policy.hpp
@@ -33,130 +33,129 @@
/**
* @brief Traits for random replacement policy
*/
-struct random_policy_traits
-{
+struct random_policy_traits {
/// @brief Name that can be used to identify the policy (for NS-3 object model and logging)
- static std::string GetName () { return "Random"; }
-
- struct policy_hook_type : public boost::intrusive::set_member_hook<> { uint32_t randomOrder; };
-
- template<class Container>
- struct container_hook
+ static std::string
+ GetName()
{
- typedef boost::intrusive::member_hook< Container,
- policy_hook_type,
- &Container::policy_hook_ > type;
+ return "Random";
+ }
+
+ struct policy_hook_type : public boost::intrusive::set_member_hook<> {
+ uint32_t randomOrder;
};
- template<class Base,
- class Container,
- class Hook>
- struct policy
- {
- static uint32_t& get_order (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 uint32_t&
+ get_order(typename Container::iterator item)
{
- return static_cast<typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->randomOrder;
+ return static_cast<typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->randomOrder;
}
-
- static const uint32_t& get_order (typename Container::const_iterator item)
+
+ static const uint32_t&
+ get_order(typename Container::const_iterator item)
{
- return static_cast<const typename policy_container::value_traits::hook_type*>
- (policy_container::value_traits::to_node_ptr(*item))->randomOrder;
+ return static_cast<const typename policy_container::value_traits::hook_type*>(
+ policy_container::value_traits::to_node_ptr(*item))->randomOrder;
}
-
+
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_order (&a) < get_order (&b);
+ return get_order(&a) < get_order(&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;
+
// could be just typedef
- class type : public policy_container
- {
+ class type : public policy_container {
public:
typedef policy policy_base; // to get access to get_order methods from outside
typedef Container parent_trie;
- type (Base &base)
- : base_ (base)
- , u_rand (0, std::numeric_limits<uint32_t>::max ())
- , max_size_ (100)
+ type(Base& base)
+ : base_(base)
+ , u_rand(0, std::numeric_limits<uint32_t>::max())
+ , max_size_(100)
{
}
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)
+ insert(typename parent_trie::iterator item)
{
- get_order (item) = u_rand.GetValue ();
+ get_order(item) = u_rand.GetValue();
- if (max_size_ != 0 && policy_container::size () >= max_size_)
- {
- if (MemberHookLess<Container>() (*item, *policy_container::begin ()))
- {
- // std::cout << "Cannot add. Signaling fail\n";
- // just return false. Indicating that insert "failed"
- return false;
- }
- else
- {
- // removing some random element
- base_.erase (&(*policy_container::begin ()));
- }
+ if (max_size_ != 0 && policy_container::size() >= max_size_) {
+ if (MemberHookLess<Container>()(*item, *policy_container::begin())) {
+ // std::cout << "Cannot add. Signaling fail\n";
+ // just return false. Indicating that insert "failed"
+ return false;
}
+ else {
+ // removing some random element
+ base_.erase(&(*policy_container::begin()));
+ }
+ }
- policy_container::insert (*item);
+ 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)
{
- 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_;
}
private:
- type () : base_(*((Base*)0)) { };
-
+ type()
+ : base_(*((Base*)0)){};
+
private:
- Base &base_;
+ Base& base_;
ns3::UniformVariable u_rand;
size_t max_size_;
};