Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add missing initializations.

Browse source
This commit is contained in:
Matthias Vallentin 2013-06-06 15:22:04 -07:00
parent 86becdd6e4
commit f2d536d2da
3 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/BloomFilter.cc
View file

@ -95,6 +95,11 @@ HashPolicy::HashVector DoubleHashing::Hash(const void* x, size_t n) const
} }
BloomFilter::BloomFilter()
: hash_(NULL)
{
}
BloomFilter::BloomFilter(size_t k) BloomFilter::BloomFilter(size_t k)
: hash_(new hash_policy(k)) : hash_(new hash_policy(k))
{ {
@ -151,6 +156,11 @@ size_t BasicBloomFilter::K(size_t cells, size_t capacity)
return std::ceil(frac * std::log(2)); return std::ceil(frac * std::log(2));
} }
BasicBloomFilter::BasicBloomFilter()
: bits_(NULL)
{
}
BasicBloomFilter::BasicBloomFilter(double fp, size_t capacity) BasicBloomFilter::BasicBloomFilter(double fp, size_t capacity)
: BloomFilter(K(M(fp, capacity), capacity)) : BloomFilter(K(M(fp, capacity), capacity))
{ {
@ -192,6 +202,11 @@ size_t BasicBloomFilter::CountImpl(const HashPolicy::HashVector& h) const
return 1; return 1;
} }
CountingBloomFilter::CountingBloomFilter()
: cells_(NULL)
{
}
CountingBloomFilter::CountingBloomFilter(double fp, size_t capacity, CountingBloomFilter::CountingBloomFilter(double fp, size_t capacity,
size_t width) size_t width)
: BloomFilter(BasicBloomFilter::K(BasicBloomFilter::M(fp, capacity), : BloomFilter(BasicBloomFilter::K(BasicBloomFilter::M(fp, capacity),

6
src/BloomFilter.h
View file

@ -188,7 +188,7 @@ public:
protected: protected:
DECLARE_ABSTRACT_SERIAL(BloomFilter); DECLARE_ABSTRACT_SERIAL(BloomFilter);
BloomFilter() { }; BloomFilter();
BloomFilter(size_t k); BloomFilter(size_t k);
virtual void AddImpl(const HashPolicy::HashVector& hashes) = 0; virtual void AddImpl(const HashPolicy::HashVector& hashes) = 0;
@ -244,7 +244,7 @@ public:
protected: protected:
DECLARE_SERIAL(BasicBloomFilter); DECLARE_SERIAL(BasicBloomFilter);
BasicBloomFilter() { } BasicBloomFilter();
virtual void AddImpl(const HashPolicy::HashVector& h); virtual void AddImpl(const HashPolicy::HashVector& h);
virtual size_t CountImpl(const HashPolicy::HashVector& h) const; virtual size_t CountImpl(const HashPolicy::HashVector& h) const;
@ -264,7 +264,7 @@ public:
protected: protected:
DECLARE_SERIAL(CountingBloomFilter); DECLARE_SERIAL(CountingBloomFilter);
CountingBloomFilter() { } CountingBloomFilter();
virtual void AddImpl(const HashPolicy::HashVector& h); virtual void AddImpl(const HashPolicy::HashVector& h);
virtual size_t CountImpl(const HashPolicy::HashVector& h) const; virtual size_t CountImpl(const HashPolicy::HashVector& h) const;

25
src/OpaqueVal.cc
View file

@ -518,13 +518,27 @@ bool EntropyVal::DoUnserialize(UnserialInfo* info)
return true; return true;
} }
BloomFilterVal::BloomFilterVal(BloomFilter* bf) BloomFilterVal::BloomFilterVal()
: OpaqueVal(bloomfilter_type), bloom_filter_(bf) : OpaqueVal(bloomfilter_type),
type_(NULL),
hash_(NULL),
bloom_filter_(NULL)
{ {
} }
BloomFilterVal::BloomFilterVal(OpaqueType* t) BloomFilterVal::BloomFilterVal(OpaqueType* t)
: OpaqueVal(t) : OpaqueVal(t),
type_(NULL),
hash_(NULL),
bloom_filter_(NULL)
{
}
BloomFilterVal::BloomFilterVal(BloomFilter* bf)
: OpaqueVal(bloomfilter_type),
type_(NULL),
hash_(NULL),
bloom_filter_(bf)
{ {
} }
@ -575,11 +589,6 @@ BloomFilterVal::~BloomFilterVal()
delete bloom_filter_; delete bloom_filter_;
} }
BloomFilterVal::BloomFilterVal()
: OpaqueVal(bloomfilter_type)
{
}
IMPLEMENT_SERIAL(BloomFilterVal, SER_BLOOMFILTER_VAL); IMPLEMENT_SERIAL(BloomFilterVal, SER_BLOOMFILTER_VAL);
bool BloomFilterVal::DoSerialize(SerialInfo* info) const bool BloomFilterVal::DoSerialize(SerialInfo* info) const