Browse Source
0.13aa4b0c2When not filtering blocks, getdata sends more in one test (Pieter Wuille)d41e44cActually only use filterInventoryKnown with MSG_TX inventory messages. (Gregory Maxwell)b6a0da4Only use filterInventoryKnown with MSG_TX inventory messages. (Patick Strateman)6b84935Rename setInventoryKnown filterInventoryKnown (Patick Strateman)e206724Remove mruset as it is no longer used. (Gregory Maxwell)ec73ef3Replace setInventoryKnown with a rolling bloom filter. (Gregory Maxwell)
Wladimir J. van der Laan
9 years ago
8 changed files with 16 additions and 166 deletions
@ -1,65 +0,0 @@ |
|||||||
// Copyright (c) 2012-2015 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_MRUSET_H |
|
||||||
#define BITCOIN_MRUSET_H |
|
||||||
|
|
||||||
#include <set> |
|
||||||
#include <vector> |
|
||||||
#include <utility> |
|
||||||
|
|
||||||
/** STL-like set container that only keeps the most recent N elements. */ |
|
||||||
template <typename T> |
|
||||||
class mruset |
|
||||||
{ |
|
||||||
public: |
|
||||||
typedef T key_type; |
|
||||||
typedef T value_type; |
|
||||||
typedef typename std::set<T>::iterator iterator; |
|
||||||
typedef typename std::set<T>::const_iterator const_iterator; |
|
||||||
typedef typename std::set<T>::size_type size_type; |
|
||||||
|
|
||||||
protected: |
|
||||||
std::set<T> set; |
|
||||||
std::vector<iterator> order; |
|
||||||
size_type first_used; |
|
||||||
size_type first_unused; |
|
||||||
const size_type nMaxSize; |
|
||||||
|
|
||||||
public: |
|
||||||
mruset(size_type nMaxSizeIn = 1) : nMaxSize(nMaxSizeIn) { clear(); } |
|
||||||
iterator begin() const { return set.begin(); } |
|
||||||
iterator end() const { return set.end(); } |
|
||||||
size_type size() const { return set.size(); } |
|
||||||
bool empty() const { return set.empty(); } |
|
||||||
iterator find(const key_type& k) const { return set.find(k); } |
|
||||||
size_type count(const key_type& k) const { return set.count(k); } |
|
||||||
void clear() |
|
||||||
{ |
|
||||||
set.clear(); |
|
||||||
order.assign(nMaxSize, set.end()); |
|
||||||
first_used = 0; |
|
||||||
first_unused = 0; |
|
||||||
} |
|
||||||
bool inline friend operator==(const mruset<T>& a, const mruset<T>& b) { return a.set == b.set; } |
|
||||||
bool inline friend operator==(const mruset<T>& a, const std::set<T>& b) { return a.set == b; } |
|
||||||
bool inline friend operator<(const mruset<T>& a, const mruset<T>& b) { return a.set < b.set; } |
|
||||||
std::pair<iterator, bool> insert(const key_type& x) |
|
||||||
{ |
|
||||||
std::pair<iterator, bool> ret = set.insert(x); |
|
||||||
if (ret.second) { |
|
||||||
if (set.size() == nMaxSize + 1) { |
|
||||||
set.erase(order[first_used]); |
|
||||||
order[first_used] = set.end(); |
|
||||||
if (++first_used == nMaxSize) first_used = 0; |
|
||||||
} |
|
||||||
order[first_unused] = ret.first; |
|
||||||
if (++first_unused == nMaxSize) first_unused = 0; |
|
||||||
} |
|
||||||
return ret; |
|
||||||
} |
|
||||||
size_type max_size() const { return nMaxSize; } |
|
||||||
}; |
|
||||||
|
|
||||||
#endif // BITCOIN_MRUSET_H
|
|
||||||
@ -1,81 +0,0 @@ |
|||||||
// Copyright (c) 2012-2013 The Bitcoin Core developers
|
|
||||||
// Distributed under the MIT software license, see the accompanying
|
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
||||||
|
|
||||||
#include "mruset.h" |
|
||||||
|
|
||||||
#include "random.h" |
|
||||||
#include "util.h" |
|
||||||
#include "test/test_bitcoin.h" |
|
||||||
|
|
||||||
#include <set> |
|
||||||
|
|
||||||
#include <boost/test/unit_test.hpp> |
|
||||||
|
|
||||||
#define NUM_TESTS 16 |
|
||||||
#define MAX_SIZE 100 |
|
||||||
|
|
||||||
using namespace std; |
|
||||||
|
|
||||||
BOOST_FIXTURE_TEST_SUITE(mruset_tests, BasicTestingSetup) |
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(mruset_test) |
|
||||||
{ |
|
||||||
// The mruset being tested.
|
|
||||||
mruset<int> mru(5000); |
|
||||||
|
|
||||||
// Run the test 10 times.
|
|
||||||
for (int test = 0; test < 10; test++) { |
|
||||||
// Reset mru.
|
|
||||||
mru.clear(); |
|
||||||
|
|
||||||
// A deque + set to simulate the mruset.
|
|
||||||
std::deque<int> rep; |
|
||||||
std::set<int> all; |
|
||||||
|
|
||||||
// Insert 10000 random integers below 15000.
|
|
||||||
for (int j=0; j<10000; j++) { |
|
||||||
int add = GetRandInt(15000); |
|
||||||
mru.insert(add); |
|
||||||
|
|
||||||
// Add the number to rep/all as well.
|
|
||||||
if (all.count(add) == 0) { |
|
||||||
all.insert(add); |
|
||||||
rep.push_back(add); |
|
||||||
if (all.size() == 5001) { |
|
||||||
all.erase(rep.front()); |
|
||||||
rep.pop_front(); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
// Do a full comparison between mru and the simulated mru every 1000 and every 5001 elements.
|
|
||||||
if (j % 1000 == 0 || j % 5001 == 0) { |
|
||||||
mruset<int> mru2 = mru; // Also try making a copy
|
|
||||||
|
|
||||||
// Check that all elements that should be in there, are in there.
|
|
||||||
BOOST_FOREACH(int x, rep) { |
|
||||||
BOOST_CHECK(mru.count(x)); |
|
||||||
BOOST_CHECK(mru2.count(x)); |
|
||||||
} |
|
||||||
|
|
||||||
// Check that all elements that are in there, should be in there.
|
|
||||||
BOOST_FOREACH(int x, mru) { |
|
||||||
BOOST_CHECK(all.count(x)); |
|
||||||
} |
|
||||||
|
|
||||||
// Check that all elements that are in there, should be in there.
|
|
||||||
BOOST_FOREACH(int x, mru2) { |
|
||||||
BOOST_CHECK(all.count(x)); |
|
||||||
} |
|
||||||
|
|
||||||
for (int t = 0; t < 10; t++) { |
|
||||||
int r = GetRandInt(15000); |
|
||||||
BOOST_CHECK(all.count(r) == mru.count(r)); |
|
||||||
BOOST_CHECK(all.count(r) == mru2.count(r)); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END() |
|
||||||
Loading…
Reference in new issue