commit e091beaa916fd2dcb974536edb9df20d8a28bad3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 14 15:27:25 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Feb 14 15:27:25 2014 -0800
tree 81c25a79a34b7ab7ddb56ab8db4cd534cf4d303b
parent bc1d1e2a388170563a1c6af855bb02a89c804bad

cs: Instantiating ContentStores with AggreageStats policy (e.g., ns3::ndn::cs::Lfu::AggregateStats)

model/cs/content-store-impl.cc

diff --git a/model/cs/content-store-impl.cc b/model/cs/content-store-impl.cc
index 39eab27..dce3924 100644
--- a/model/cs/content-store-impl.cc
+++ b/model/cs/content-store-impl.cc
@@ -24,6 +24,8 @@
 #include "../../utils/trie/lru-policy.h"
 #include "../../utils/trie/fifo-policy.h"
 #include "../../utils/trie/lfu-policy.h"
+#include "../../utils/trie/multi-policy.h"
+#include "../../utils/trie/aggregate-stats-policy.h"
 
 #define NS_OBJECT_ENSURE_REGISTERED_TEMPL(type, templ)  \
   static struct X ## type ## templ ## RegistrationClass \
@@ -65,9 +67,30 @@
 NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, lru_policy_traits);
 NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, random_policy_traits);
 NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, fifo_policy_traits);
-
 NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, lfu_policy_traits);
 
+
+typedef multi_policy_traits< boost::mpl::vector2< lru_policy_traits,
+                                                  aggregate_stats_policy_traits > > LruWithCountsTraits;
+typedef multi_policy_traits< boost::mpl::vector2< random_policy_traits,
+                                                  aggregate_stats_policy_traits > > RandomWithCountsTraits;
+typedef multi_policy_traits< boost::mpl::vector2< fifo_policy_traits,
+                                                  aggregate_stats_policy_traits > > FifoWithCountsTraits;
+typedef multi_policy_traits< boost::mpl::vector2< lfu_policy_traits,
+                                                  aggregate_stats_policy_traits > > LfuWithCountsTraits;
+
+template class ContentStoreImpl<LruWithCountsTraits>;
+NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, LruWithCountsTraits);
+
+template class ContentStoreImpl<RandomWithCountsTraits>;
+NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, RandomWithCountsTraits);
+
+template class ContentStoreImpl<FifoWithCountsTraits>;
+NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, FifoWithCountsTraits);
+
+template class ContentStoreImpl<LfuWithCountsTraits>;
+NS_OBJECT_ENSURE_REGISTERED_TEMPL(ContentStoreImpl, LfuWithCountsTraits);
+
 #ifdef DOXYGEN
 // /**
 //  * \brief Content Store implementing LRU cache replacement policy