diff --git a/src/limitedmap.h b/src/limitedmap.h deleted file mode 100644 --- a/src/limitedmap.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) 2012-2016 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#ifndef BITCOIN_LIMITEDMAP_H -#define BITCOIN_LIMITEDMAP_H - -#include -#include - -/** - * STL-like map container that only keeps the N elements with the highest value. - */ -template class limitedmap { -public: - typedef K key_type; - typedef V mapped_type; - typedef std::pair value_type; - typedef typename std::map::const_iterator const_iterator; - typedef typename std::map::size_type size_type; - -protected: - std::map map; - typedef typename std::map::iterator iterator; - std::multimap rmap; - typedef typename std::multimap::iterator rmap_iterator; - size_type nMaxSize; - -public: - explicit limitedmap(size_type nMaxSizeIn) { - assert(nMaxSizeIn > 0); - nMaxSize = nMaxSizeIn; - } - const_iterator begin() const { return map.begin(); } - const_iterator end() const { return map.end(); } - size_type size() const { return map.size(); } - bool empty() const { return map.empty(); } - const_iterator find(const key_type &k) const { return map.find(k); } - size_type count(const key_type &k) const { return map.count(k); } - void insert(const value_type &x) { - std::pair ret = map.insert(x); - if (ret.second) { - if (map.size() > nMaxSize) { - map.erase(rmap.begin()->second); - rmap.erase(rmap.begin()); - } - rmap.insert(make_pair(x.second, ret.first)); - } - } - void erase(const key_type &k) { - iterator itTarget = map.find(k); - if (itTarget == map.end()) { - return; - } - std::pair itPair = - rmap.equal_range(itTarget->second); - for (rmap_iterator it = itPair.first; it != itPair.second; ++it) { - if (it->second == itTarget) { - rmap.erase(it); - map.erase(itTarget); - return; - } - } - // Shouldn't ever get here - assert(0); - } - void update(const_iterator itIn, const mapped_type &v) { - // Using map::erase() with empty range instead of map::find() to get a - // non-const iterator, since it is a constant time operation in C++11. - // For more details, see - // https://stackoverflow.com/questions/765148/how-to-remove-constness-of-const-iterator - iterator itTarget = map.erase(itIn, itIn); - - if (itTarget == map.end()) return; - std::pair itPair = - rmap.equal_range(itTarget->second); - for (rmap_iterator it = itPair.first; it != itPair.second; ++it) { - if (it->second == itTarget) { - rmap.erase(it); - itTarget->second = v; - rmap.insert(make_pair(v, itTarget)); - return; - } - } - // Shouldn't ever get here - assert(0); - } - size_type max_size() const { return nMaxSize; } - size_type max_size(size_type s) { - assert(s > 0); - while (map.size() > s) { - map.erase(rmap.begin()->second); - rmap.erase(rmap.begin()); - } - nMaxSize = s; - return nMaxSize; - } -}; - -#endif // BITCOIN_LIMITEDMAP_H diff --git a/src/net.h b/src/net.h --- a/src/net.h +++ b/src/net.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -164,7 +164,6 @@ key_io_tests.cpp key_tests.cpp lcg_tests.cpp - limitedmap_tests.cpp logging_tests.cpp mempool_tests.cpp merkle_tests.cpp