commit ff10da6575ee8758b35fb9ad025e4b8e2b2eb5e8
author Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 13 17:57:43 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Jul 13 17:57:43 2016 +0000
tree 8201ab4619facde54f8fe7d312adb3956b499e7a
parent af9aa366fd511c20078cb7e73bab2c04ff09b7bf

table: attach unique_ptr<strategy_choice::Entry> onto NameTree

refs #3164

Change-Id: I5cce7e43dba77cdaaa07347ec7ffca13f242113c

daemon/table/strategy-choice.cpp

diff --git a/daemon/table/strategy-choice.cpp b/daemon/table/strategy-choice.cpp
index de7cb13..5778237 100644
--- a/daemon/table/strategy-choice.cpp
+++ b/daemon/table/strategy-choice.cpp
@@ -30,8 +30,8 @@
 #include "measurements-entry.hpp"
 
 namespace nfd {
+namespace strategy_choice {
 
-using strategy_choice::Entry;
 using fw::Strategy;
 
 NFD_LOG_INIT("StrategyChoice");
@@ -96,7 +96,7 @@
   }
 
   shared_ptr<name_tree::Entry> nte = m_nameTree.lookup(prefix);
-  shared_ptr<Entry> entry = nte->getStrategyChoiceEntry();
+  Entry* entry = nte->getStrategyChoiceEntry();
   Strategy* oldStrategy = nullptr;
   if (entry != nullptr) {
     if (entry->getStrategy().getName() == strategy->getName()) {
@@ -110,8 +110,9 @@
 
   if (entry == nullptr) {
     oldStrategy = &this->findEffectiveStrategy(prefix);
-    entry = make_shared<Entry>(prefix);
-    nte->setStrategyChoiceEntry(entry);
+    auto newEntry = make_unique<Entry>(prefix);
+    entry = newEntry.get();
+    nte->setStrategyChoiceEntry(std::move(newEntry));
     ++m_nItems;
     NFD_LOG_TRACE("insert(" << prefix << ") new entry " << strategy->getName());
   }
@@ -131,7 +132,7 @@
     return;
   }
 
-  shared_ptr<Entry> entry = nte->getStrategyChoiceEntry();
+  Entry* entry = nte->getStrategyChoiceEntry();
   if (entry == nullptr) {
     return;
   }
@@ -141,7 +142,7 @@
   Strategy& parentStrategy = this->findEffectiveStrategy(prefix.getPrefix(-1));
   this->changeStrategy(*entry, oldStrategy, parentStrategy);
 
-  nte->setStrategyChoiceEntry(shared_ptr<Entry>());
+  nte->setStrategyChoiceEntry(nullptr);
   m_nameTree.eraseEntryIfEmpty(nte);
   --m_nItems;
 }
@@ -151,24 +152,22 @@
 {
   shared_ptr<name_tree::Entry> nte = m_nameTree.findExactMatch(prefix);
   if (nte == nullptr) {
-    return { false, Name() };
+    return {false, Name()};
   }
 
-  shared_ptr<Entry> entry = nte->getStrategyChoiceEntry();
+  Entry* entry = nte->getStrategyChoiceEntry();
   if (entry == nullptr) {
-    return { false, Name() };
+    return {false, Name()};
   }
 
-  return { true, entry->getStrategy().getName() };
+  return {true, entry->getStrategy().getName()};
 }
 
 Strategy&
 StrategyChoice::findEffectiveStrategy(const Name& prefix) const
 {
   shared_ptr<name_tree::Entry> nte = m_nameTree.findLongestPrefixMatch(prefix,
-    [] (const name_tree::Entry& entry) {
-      return entry.getStrategyChoiceEntry() != nullptr;
-    });
+    [] (const name_tree::Entry& entry) { return entry.getStrategyChoiceEntry() != nullptr; });
 
   BOOST_ASSERT(nte != nullptr);
   return nte->getStrategyChoiceEntry()->getStrategy();
@@ -177,14 +176,12 @@
 Strategy&
 StrategyChoice::findEffectiveStrategy(shared_ptr<name_tree::Entry> nte) const
 {
-  shared_ptr<strategy_choice::Entry> entry = nte->getStrategyChoiceEntry();
+  Entry* entry = nte->getStrategyChoiceEntry();
   if (entry != nullptr)
     return entry->getStrategy();
 
   nte = m_nameTree.findLongestPrefixMatch(nte,
-    [] (const name_tree::Entry& entry) {
-      return entry.getStrategyChoiceEntry() != nullptr;
-    });
+    [] (const name_tree::Entry& entry) { return entry.getStrategyChoiceEntry() != nullptr; });
 
   BOOST_ASSERT(nte != nullptr);
   return nte->getStrategyChoiceEntry()->getStrategy();
@@ -213,15 +210,15 @@
 {
   this->install(strategy);
 
+  auto entry = make_unique<Entry>(Name());
+  entry->setStrategy(*strategy);
+
   // don't use .insert here, because it will invoke findEffectiveStrategy
   // which expects an existing root entry
   shared_ptr<name_tree::Entry> nte = m_nameTree.lookup(Name());
-  shared_ptr<Entry> entry = make_shared<Entry>(Name());
-  nte->setStrategyChoiceEntry(entry);
+  nte->setStrategyChoiceEntry(std::move(entry));
   ++m_nItems;
   NFD_LOG_INFO("setDefaultStrategy " << strategy->getName());
-
-  entry->setStrategy(*strategy);
 }
 
 static inline void
@@ -244,7 +241,7 @@
 }
 
 void
-StrategyChoice::changeStrategy(strategy_choice::Entry& entry,
+StrategyChoice::changeStrategy(Entry& entry,
                                fw::Strategy& oldStrategy,
                                fw::Strategy& newStrategy)
 {
@@ -284,4 +281,5 @@
   return const_iterator(enumerable.begin());
 }
 
+} // namespace strategy_choice
 } // namespace nfd