Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 04:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-serializer

Browse source
This commit is contained in:
Johanna Amann 2019-06-17 09:50:05 -07:00
commit a50b06d6c1
543 changed files with 6954 additions and 6478 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/probabilistic/Topk.cc
View file

@ -185,7 +185,7 @@ Val* TopkVal::DoClone(CloneState* state)
{
auto clone = new TopkVal(size);
clone->Merge(this);
return clone;
return state->NewClone(this, clone);
}
VectorVal* TopkVal::GetTopK(int k) const // returns vector

8
src/probabilistic/bloom-filter.bif
View file

@ -23,7 +23,7 @@ module GLOBAL;
##
## name: A name that uniquely identifies and seeds the Bloom filter. If empty,
## the filter will use :zeek:id:`global_hash_seed` if that's set, and
## otherwise use a local seed tied to the current Bro process. Only
## otherwise use a local seed tied to the current Zeek process. Only
## filters with the same seed can be merged with
## :zeek:id:`bloomfilter_merge`.
##
@ -60,7 +60,7 @@ function bloomfilter_basic_init%(fp: double, capacity: count,
##
## name: A name that uniquely identifies and seeds the Bloom filter. If empty,
## the filter will use :zeek:id:`global_hash_seed` if that's set, and
## otherwise use a local seed tied to the current Bro process. Only
## otherwise use a local seed tied to the current Zeek process. Only
## filters with the same seed can be merged with
## :zeek:id:`bloomfilter_merge`.
##
@ -104,7 +104,7 @@ function bloomfilter_basic_init2%(k: count, cells: count,
##
## name: A name that uniquely identifies and seeds the Bloom filter. If empty,
## the filter will use :zeek:id:`global_hash_seed` if that's set, and
## otherwise use a local seed tied to the current Bro process. Only
## otherwise use a local seed tied to the current Zeek process. Only
## filters with the same seed can be merged with
## :zeek:id:`bloomfilter_merge`.
##
@ -206,7 +206,7 @@ function bloomfilter_clear%(bf: opaque of bloomfilter%): any
## Merges two Bloom filters.
##
## .. note:: Currently Bloom filters created by different Bro instances cannot
## .. note:: Currently Bloom filters created by different Zeek instances cannot
## be merged. In the future, this will be supported as long as both filters
## are created with the same name.
##