diff --git a/indexer/index.cpp b/indexer/index.cpp index f8adf0c82d..508e0306c0 100644 --- a/indexer/index.cpp +++ b/indexer/index.cpp @@ -36,7 +36,7 @@ void MwmValue::SetTable(MwmInfoEx & info) // Index implementation ////////////////////////////////////////////////////////////////////////////////// -MwmInfoEx * Index::CreateInfo(platform::LocalCountryFile const & localFile) const +unique_ptr Index::CreateInfo(platform::LocalCountryFile const & localFile) const { MwmValue value(localFile); @@ -44,7 +44,7 @@ MwmInfoEx * Index::CreateInfo(platform::LocalCountryFile const & localFile) cons if (!h.IsMWMSuitable()) return nullptr; - MwmInfoEx * info = new MwmInfoEx(); + unique_ptr info(new MwmInfoEx()); info->m_limitRect = h.GetBounds(); pair const scaleR = h.GetScaleRange(); @@ -52,16 +52,15 @@ MwmInfoEx * Index::CreateInfo(platform::LocalCountryFile const & localFile) cons info->m_maxScale = static_cast(scaleR.second); info->m_version = value.GetMwmVersion(); - return info; + return unique_ptr(move(info)); } -MwmValue * Index::CreateValue(MwmInfo & info) const +unique_ptr Index::CreateValue(MwmInfo & info) const { unique_ptr p(new MwmValue(info.GetLocalFile())); p->SetTable(dynamic_cast(info)); ASSERT(p->GetHeader().IsMWMSuitable(), ()); - - return p.release(); + return unique_ptr(move(p)); } pair Index::RegisterMap(LocalCountryFile const & localFile) diff --git a/indexer/index.hpp b/indexer/index.hpp index c2664b57da..44057132dd 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -48,9 +48,9 @@ class Index : public MwmSet protected: /// @name MwmSet overrides. //@{ - MwmInfoEx * CreateInfo(platform::LocalCountryFile const & localFile) const override; + unique_ptr CreateInfo(platform::LocalCountryFile const & localFile) const override; - MwmValue * CreateValue(MwmInfo & info) const override; + unique_ptr CreateValue(MwmInfo & info) const override; void OnMwmDeregistered(platform::LocalCountryFile const & localFile) override; //@} diff --git a/indexer/indexer_tests/test_mwm_set.hpp b/indexer/indexer_tests/test_mwm_set.hpp index 853d78b927..dcd7c8e5d1 100644 --- a/indexer/indexer_tests/test_mwm_set.hpp +++ b/indexer/indexer_tests/test_mwm_set.hpp @@ -16,19 +16,19 @@ class TestMwmSet : public MwmSet protected: /// @name MwmSet overrides //@{ - MwmInfo * CreateInfo(platform::LocalCountryFile const & localFile) const override + unique_ptr CreateInfo(platform::LocalCountryFile const & localFile) const override { int const n = localFile.GetCountryName()[0] - '0'; - MwmInfo * info = new MwmInfo(); + unique_ptr info(new MwmInfo()); info->m_maxScale = n; info->m_limitRect = m2::RectD(0, 0, 1, 1); info->m_version.format = version::lastFormat; return info; } - MwmValueBase * CreateValue(MwmInfo &) const override + unique_ptr CreateValue(MwmInfo &) const override { - return new MwmValueBase(); + return make_unique(); } //@} }; diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index 8432cd1e6b..e5ee51cd01 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -38,13 +38,14 @@ string DebugPrint(MwmSet::MwmId const & id) MwmSet::MwmHandle::MwmHandle() : m_mwmSet(nullptr), m_mwmId(), m_value(nullptr) {} -MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId, TMwmValuePtr value) - : m_mwmSet(&mwmSet), m_mwmId(mwmId), m_value(value) +MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId, + unique_ptr && value) + : m_mwmSet(&mwmSet), m_mwmId(mwmId), m_value(move(value)) { } MwmSet::MwmHandle::MwmHandle(MwmHandle && handle) - : m_mwmSet(handle.m_mwmSet), m_mwmId(handle.m_mwmId), m_value(handle.m_value) + : m_mwmSet(handle.m_mwmSet), m_mwmId(handle.m_mwmId), m_value(move(handle.m_value)) { handle.m_mwmSet = nullptr; handle.m_mwmId.Reset(); @@ -54,7 +55,7 @@ MwmSet::MwmHandle::MwmHandle(MwmHandle && handle) MwmSet::MwmHandle::~MwmHandle() { if (m_mwmSet && m_value) - m_mwmSet->UnlockValue(m_mwmId, m_value); + m_mwmSet->UnlockValue(m_mwmId, move(m_value)); } shared_ptr const & MwmSet::MwmHandle::GetInfo() const @@ -184,13 +185,13 @@ void MwmSet::GetMwmsInfo(vector> & info) const } } -MwmSet::TMwmValuePtr MwmSet::LockValue(MwmId const & id) +unique_ptr MwmSet::LockValue(MwmId const & id) { lock_guard lock(m_lock); return LockValueImpl(id); } -MwmSet::TMwmValuePtr MwmSet::LockValueImpl(MwmId const & id) +unique_ptr MwmSet::LockValueImpl(MwmId const & id) { CHECK(id.IsAlive(), (id)); shared_ptr info = id.GetInfo(); @@ -207,22 +208,22 @@ MwmSet::TMwmValuePtr MwmSet::LockValueImpl(MwmId const & id) { if (it->first == id) { - TMwmValuePtr result = it->second; + unique_ptr result = move(it->second); m_cache.erase(it); return result; } } - return TMwmValuePtr(CreateValue(*info)); + return CreateValue(*info); } -void MwmSet::UnlockValue(MwmId const & id, TMwmValuePtr p) +void MwmSet::UnlockValue(MwmId const & id, unique_ptr && p) { lock_guard lock(m_lock); - UnlockValueImpl(id, p); + UnlockValueImpl(id, move(p)); } -void MwmSet::UnlockValueImpl(MwmId const & id, TMwmValuePtr p) +void MwmSet::UnlockValueImpl(MwmId const & id, unique_ptr && p) { ASSERT(id.IsAlive() && p, (id)); if (!id.IsAlive() || !p) @@ -239,13 +240,11 @@ void MwmSet::UnlockValueImpl(MwmId const & id, TMwmValuePtr p) /// @todo Probably, it's better to store only "unique by id" free caches here. /// But it's no obvious if we have many threads working with the single mwm. - m_cache.push_back(make_pair(id, p)); + m_cache.push_back(make_pair(id, move(p))); if (m_cache.size() > m_cacheSize) { ASSERT_EQUAL(m_cache.size(), m_cacheSize + 1, ()); - auto p = m_cache.front(); m_cache.pop_front(); - delete p.second; } } } @@ -283,27 +282,24 @@ MwmSet::MwmHandle MwmSet::GetMwmHandleById(MwmId const & id) MwmSet::MwmHandle MwmSet::GetMwmHandleByIdImpl(MwmId const & id) { - TMwmValuePtr value(nullptr); + unique_ptr value; if (id.IsAlive()) value = LockValueImpl(id); - return MwmHandle(*this, id, value); + return MwmHandle(*this, id, move(value)); } void MwmSet::ClearCacheImpl(CacheType::iterator beg, CacheType::iterator end) { - for (auto i = beg; i != end; ++i) - delete i->second; m_cache.erase(beg, end); } void MwmSet::ClearCache(MwmId const & id) { - ClearCacheImpl(RemoveIfKeepValid(m_cache.begin(), m_cache.end(), - [&id] (pair const & p) + auto sameId = [&id](pair> const & p) { return (p.first == id); - }), - m_cache.end()); + }; + ClearCacheImpl(RemoveIfKeepValid(m_cache.begin(), m_cache.end(), sameId), m_cache.end()); } string DebugPrint(MwmSet::RegResult result) diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp index 5cd6f84b98..fb705ce7de 100644 --- a/indexer/mwm_set.hpp +++ b/indexer/mwm_set.hpp @@ -13,6 +13,7 @@ #include "std/mutex.hpp" #include "std/shared_ptr.hpp" #include "std/string.hpp" +#include "std/unique_ptr.hpp" #include "std/utility.hpp" #include "std/vector.hpp" @@ -112,8 +113,6 @@ public: virtual ~MwmValueBase() = default; }; - using TMwmValuePtr = MwmValueBase *; - // Mwm handle, which is used to refer to mwm and prevent it from // deletion when its FileContainer is used. class MwmHandle final @@ -127,10 +126,10 @@ public: template inline T * GetValue() const { - return static_cast(m_value); + return static_cast(m_value.get()); } - inline bool IsAlive() const { return m_value; } + inline bool IsAlive() const { return m_value.get() != nullptr; } inline MwmId const & GetId() const { return m_mwmId; } shared_ptr const & GetInfo() const; @@ -139,11 +138,11 @@ public: private: friend class MwmSet; - MwmHandle(MwmSet & mwmSet, MwmId const & mwmId, TMwmValuePtr value); + MwmHandle(MwmSet & mwmSet, MwmId const & mwmId, unique_ptr && value); MwmSet * m_mwmSet; MwmId m_mwmId; - TMwmValuePtr m_value; + unique_ptr m_value; DISALLOW_COPY(MwmHandle); }; @@ -218,19 +217,19 @@ public: protected: /// @return True when file format version was successfully read to MwmInfo. - virtual MwmInfo * CreateInfo(platform::LocalCountryFile const & localFile) const = 0; - virtual MwmValueBase * CreateValue(MwmInfo & info) const = 0; + virtual unique_ptr CreateInfo(platform::LocalCountryFile const & localFile) const = 0; + virtual unique_ptr CreateValue(MwmInfo & info) const = 0; private: - typedef deque> CacheType; + typedef deque>> CacheType; /// @precondition This function is always called under mutex m_lock. MwmHandle GetMwmHandleByIdImpl(MwmId const & id); - TMwmValuePtr LockValue(MwmId const & id); - TMwmValuePtr LockValueImpl(MwmId const & id); - void UnlockValue(MwmId const & id, TMwmValuePtr p); - void UnlockValueImpl(MwmId const & id, TMwmValuePtr p); + unique_ptr LockValue(MwmId const & id); + unique_ptr LockValueImpl(MwmId const & id); + void UnlockValue(MwmId const & id, unique_ptr && p); + void UnlockValueImpl(MwmId const & id, unique_ptr && p); /// Do the cleaning for [beg, end) without acquiring the mutex. /// @precondition This function is always called under mutex m_lock. diff --git a/routing/routing_tests/road_graph_builder.cpp b/routing/routing_tests/road_graph_builder.cpp index 73e329c431..82b6da646c 100644 --- a/routing/routing_tests/road_graph_builder.cpp +++ b/routing/routing_tests/road_graph_builder.cpp @@ -38,17 +38,17 @@ public: private: /// @name MwmSet overrides //@{ - MwmInfo * CreateInfo(platform::LocalCountryFile const &) const override + unique_ptr CreateInfo(platform::LocalCountryFile const &) const override { - MwmInfo * info = new MwmInfo(); + unique_ptr info(new MwmInfo()); info->m_maxScale = 1; info->m_limitRect = m2::RectD(0, 0, 1, 1); info->m_version.format = version::lastFormat; return info; } - MwmValueBase * CreateValue(MwmInfo &) const override + unique_ptr CreateValue(MwmInfo &) const override { - return new MwmValueBase(); + return make_unique(); } //@}