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 3

Move Reporter to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-20 10:57:36 -07:00
parent 7cedd94ee7
commit bfab224d7c
132 changed files with 1010 additions and 987 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/probabilistic/BloomFilter.cc
View file

@ -110,13 +110,13 @@ bool BasicBloomFilter::Merge(const BloomFilter* other)
if ( ! hasher->Equals(o->hasher) )
{
reporter->Error("incompatible hashers in BasicBloomFilter merge");
zeek::reporter->Error("incompatible hashers in BasicBloomFilter merge");
return false;
}
else if ( bits->Size() != o->bits->Size() )
{
reporter->Error("different bitvector size in BasicBloomFilter merge");
zeek::reporter->Error("different bitvector size in BasicBloomFilter merge");
return false;
}
@ -229,13 +229,13 @@ bool CountingBloomFilter::Merge(const BloomFilter* other)
if ( ! hasher->Equals(o->hasher) )
{
reporter->Error("incompatible hashers in CountingBloomFilter merge");
zeek::reporter->Error("incompatible hashers in CountingBloomFilter merge");
return false;
}
else if ( cells->Size() != o->cells->Size() )
{
reporter->Error("different bitvector size in CountingBloomFilter merge");
zeek::reporter->Error("different bitvector size in CountingBloomFilter merge");
return false;
}

4
src/probabilistic/CardinalityCounter.cc
View file

@ -50,11 +50,11 @@ void CardinalityCounter::Init(uint64_t size)
alpha_m = 0.7213 / (1 + 1.079 / m);
else
reporter->InternalError("Invalid size %" PRIu64 ". Size either has to be 16, 32, 64 or bigger than 128", size);
zeek::reporter->InternalError("Invalid size %" PRIu64 ". Size either has to be 16, 32, 64 or bigger than 128", size);
double calc_p = log2(m);
if ( trunc(calc_p) != calc_p )
reporter->InternalError("Invalid size %" PRIu64 ". Size either has to be a power of 2", size);
zeek::reporter->InternalError("Invalid size %" PRIu64 ". Size either has to be a power of 2", size);
p = calc_p;

12
src/probabilistic/Topk.cc
View file

@ -87,7 +87,7 @@ void TopkVal::Merge(const TopkVal* value, bool doPrune)
{
if ( ! same_type(type, value->type) )
{
reporter->Error("Cannot merge top-k elements of differing types.");
zeek::reporter->Error("Cannot merge top-k elements of differing types.");
return;
}
}
@ -186,7 +186,7 @@ zeek::VectorValPtr TopkVal::GetTopK(int k) const // returns vector
{
if ( numElements == 0 )
{
reporter->Error("Cannot return topk of empty");
zeek::reporter->Error("Cannot return topk of empty");
return nullptr;
}
@ -228,7 +228,7 @@ uint64_t TopkVal::GetCount(Val* value) const
if ( e == nullptr )
{
reporter->Error("GetCount for element that is not in top-k");
zeek::reporter->Error("GetCount for element that is not in top-k");
return 0;
}
@ -243,7 +243,7 @@ uint64_t TopkVal::GetEpsilon(Val* value) const
if ( e == nullptr )
{
reporter->Error("GetEpsilon for element that is not in top-k");
zeek::reporter->Error("GetEpsilon for element that is not in top-k");
return 0;
}
@ -263,7 +263,7 @@ uint64_t TopkVal::GetSum() const
}
if ( pruned )
reporter->Warning("TopkVal::GetSum() was used on a pruned data structure. Result values do not represent total element count");
zeek::reporter->Warning("TopkVal::GetSum() was used on a pruned data structure. Result values do not represent total element count");
return sum;
}
@ -277,7 +277,7 @@ void TopkVal::Encountered(zeek::ValPtr encountered)
else
if ( ! same_type(type, encountered->GetType()) )
{
reporter->Error("Trying to add element to topk with differing type from other elements");
zeek::reporter->Error("Trying to add element to topk with differing type from other elements");
return;
}