From c449a648b4174f9aa8955ffcdfb939e83bd6d35e Mon Sep 17 00:00:00 2001 From: Vlad Gluhovsky Date: Tue, 16 Jun 2015 23:17:59 +0200 Subject: [PATCH] naming conventions changed --- libwhisper/BloomFilter.cpp | 4 ++-- libwhisper/BloomFilter.h | 12 +++++++----- libwhisper/Common.cpp | 5 +++-- libwhisper/Common.h | 2 +- libwhisper/WhisperHost.cpp | 4 ++-- test/libwhisper/bloomFilter.cpp | 28 ++++++++++++++-------------- 6 files changed, 29 insertions(+), 26 deletions(-) diff --git a/libwhisper/BloomFilter.cpp b/libwhisper/BloomFilter.cpp index e02b6e1d0..c189ee912 100644 --- a/libwhisper/BloomFilter.cpp +++ b/libwhisper/BloomFilter.cpp @@ -27,7 +27,7 @@ using namespace dev::shh; static unsigned const c_mask[] = { 1, 2, 4, 8, 16, 32, 64, 128 }; -void TopicBloomFilter::add(AbridgedTopic const& _h) +void TopicBloomFilter::addRaw(AbridgedTopic const& _h) { *this |= _h; for (unsigned i = 0; i < CounterSize; ++i) @@ -43,7 +43,7 @@ void TopicBloomFilter::add(AbridgedTopic const& _h) } } -void TopicBloomFilter::remove(AbridgedTopic const& _h) +void TopicBloomFilter::removeRaw(AbridgedTopic const& _h) { for (unsigned i = 0; i < CounterSize; ++i) if (isBitSet(_h, i)) diff --git a/libwhisper/BloomFilter.h b/libwhisper/BloomFilter.h index 188e69f59..0ca460805 100644 --- a/libwhisper/BloomFilter.h +++ b/libwhisper/BloomFilter.h @@ -34,19 +34,21 @@ public: TopicBloomFilter() { init(); } TopicBloomFilter(AbridgedTopic const& _h): AbridgedTopic(_h) { init(); } - void addBloom(AbridgedTopic const& _h) { add(_h.template bloomPart()); } - void removeBloom(AbridgedTopic const& _h) { remove(_h.template bloomPart()); } - void add(AbridgedTopic const& _h); - void remove(AbridgedTopic const& _h); + void addBloom(AbridgedTopic const& _h) { addRaw(_h.template bloomPart()); } + void removeBloom(AbridgedTopic const& _h) { removeRaw(_h.template bloomPart()); } bool containsBloom(AbridgedTopic const& _h) const { return contains(_h.template bloomPart()); } + void addRaw(AbridgedTopic const& _h); + void removeRaw(AbridgedTopic const& _h); + bool containsRaw(AbridgedTopic const& _h) const { return contains(_h); } + enum { BitsPerBloom = 3 }; private: void init() { for (unsigned i = 0; i < CounterSize; ++i) m_refCounter[i] = 0; } static bool isBitSet(AbridgedTopic const& _h, unsigned _index); - enum { CounterSize = 8 * AbridgedTopic::size }; + enum { CounterSize = 8 * TopicBloomFilter::size }; std::array m_refCounter; }; diff --git a/libwhisper/Common.cpp b/libwhisper/Common.cpp index 92fd997c5..5dc267fcf 100644 --- a/libwhisper/Common.cpp +++ b/libwhisper/Common.cpp @@ -22,6 +22,7 @@ #include "Common.h" #include #include "Message.h" +#include "BloomFilter.h" using namespace std; using namespace dev; @@ -94,12 +95,12 @@ TopicFilter::TopicFilter(RLP const& _r) } } -AbridgedTopic TopicFilter::exportBloomFilter() const +AbridgedTopic TopicFilter::exportBloom() const { AbridgedTopic ret; for (TopicMask const& t: m_topicMasks) for (auto i: t) - ret |= i.first; + ret |= i.first.template bloomPart(); return ret; } diff --git a/libwhisper/Common.h b/libwhisper/Common.h index eb624893a..07c5b3317 100644 --- a/libwhisper/Common.h +++ b/libwhisper/Common.h @@ -105,7 +105,7 @@ public: void streamRLP(RLPStream& _s) const { _s << m_topicMasks; } h256 sha3() const; bool matches(Envelope const& _m) const; - AbridgedTopic exportBloomFilter() const; + AbridgedTopic exportBloom() const; private: TopicMasks m_topicMasks; diff --git a/libwhisper/WhisperHost.cpp b/libwhisper/WhisperHost.cpp index 962abd829..d6759df6f 100644 --- a/libwhisper/WhisperHost.cpp +++ b/libwhisper/WhisperHost.cpp @@ -113,7 +113,7 @@ unsigned WhisperHost::installWatch(shh::Topics const& _t) if (!m_filters.count(h)) m_filters.insert(make_pair(h, f)); - m_bloom.add(f.filter.exportBloomFilter()); + m_bloom.addRaw(f.filter.exportBloom()); return installWatchOnId(h); } @@ -153,7 +153,7 @@ void WhisperHost::uninstallWatch(unsigned _i) auto fit = m_filters.find(id); if (fit != m_filters.end()) { - m_bloom.remove(fit->second.filter.exportBloomFilter()); + m_bloom.removeRaw(fit->second.filter.exportBloom()); if (!--fit->second.refCount) m_filters.erase(fit); } diff --git a/test/libwhisper/bloomFilter.cpp b/test/libwhisper/bloomFilter.cpp index d7a4c76ef..adf76c429 100644 --- a/test/libwhisper/bloomFilter.cpp +++ b/test/libwhisper/bloomFilter.cpp @@ -29,16 +29,16 @@ using namespace dev::shh; void testAddNonExisting(TopicBloomFilter& _f, AbridgedTopic const& _h) { - BOOST_REQUIRE(!_f.contains(_h)); - _f.add(_h); - BOOST_REQUIRE(_f.contains(_h)); + BOOST_REQUIRE(!_f.containsRaw(_h)); + _f.addRaw(_h); + BOOST_REQUIRE(_f.containsRaw(_h)); } void testRemoveExisting(TopicBloomFilter& _f, AbridgedTopic const& _h) { - BOOST_REQUIRE(_f.contains(_h)); - _f.remove(_h); - BOOST_REQUIRE(!_f.contains(_h)); + BOOST_REQUIRE(_f.containsRaw(_h)); + _f.removeRaw(_h); + BOOST_REQUIRE(!_f.containsRaw(_h)); } void testAddNonExistingBloom(TopicBloomFilter& _f, AbridgedTopic const& _h) @@ -110,9 +110,9 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(f.contains(b00110110)); BOOST_REQUIRE(f.contains(b00110111)); - f.remove(b00000001); - f.remove(b00000001); - f.remove(b00000001); + f.removeRaw(b00000001); + f.removeRaw(b00000001); + f.removeRaw(b00000001); BOOST_REQUIRE(!f.contains(b00000001)); BOOST_REQUIRE(f.contains(b00010000)); BOOST_REQUIRE(f.contains(b00011000)); @@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(f.contains(b00110110)); BOOST_REQUIRE(!f.contains(b00110111)); - f.remove(b00010000); + f.removeRaw(b00010000); BOOST_REQUIRE(!f.contains(b00000001)); BOOST_REQUIRE(f.contains(b00010000)); BOOST_REQUIRE(f.contains(b00011000)); @@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(f.contains(b00110110)); BOOST_REQUIRE(!f.contains(b00110111)); - f.remove(b00111000); + f.removeRaw(b00111000); BOOST_REQUIRE(!f.contains(b00000001)); BOOST_REQUIRE(f.contains(b00010000)); BOOST_REQUIRE(!f.contains(b00011000)); @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(f.contains(b00110110)); BOOST_REQUIRE(!f.contains(b00110111)); - f.add(b00000001); + f.addRaw(b00000001); BOOST_REQUIRE(f.contains(b00000001)); BOOST_REQUIRE(f.contains(b00010000)); BOOST_REQUIRE(!f.contains(b00011000)); @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(f.contains(b00110110)); BOOST_REQUIRE(f.contains(b00110111)); - f.remove(b00110111); + f.removeRaw(b00110111); BOOST_REQUIRE(!f.contains(b00000001)); BOOST_REQUIRE(f.contains(b00010000)); BOOST_REQUIRE(!f.contains(b00011000)); @@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE(bloomFilterRaw) BOOST_REQUIRE(!f.contains(b00110110)); BOOST_REQUIRE(!f.contains(b00110111)); - f.remove(b00110111); + f.removeRaw(b00110111); BOOST_REQUIRE(!f.contains(b00000001)); BOOST_REQUIRE(!f.contains(b00010000)); BOOST_REQUIRE(!f.contains(b00011000));