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

Switch some TopkVal methods to use IntrusivePtr

Browse source
This commit is contained in:
Jon Siwek 2020-05-18 15:55:30 -07:00
parent d35e5520f8
commit aa9d9c904f
3 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/probabilistic/Topk.cc
View file

@ -18,11 +18,6 @@ static void topk_element_hash_delete_func(void* val)
delete e; delete e;
} }
Element::~Element()
{
Unref(value);
}
void TopkVal::Typify(IntrusivePtr<BroType> t) void TopkVal::Typify(IntrusivePtr<BroType> t)
{ {
assert(!hash && !type); assert(!hash && !type);
@ -116,7 +111,7 @@ void TopkVal::Merge(const TopkVal* value, bool doPrune)
{ {
olde = new Element(); olde = new Element();
olde->epsilon = 0; olde->epsilon = 0;
olde->value = e->value->Ref(); olde->value = e->value;
// insert at bucket position 0 // insert at bucket position 0
if ( buckets.size() > 0 ) if ( buckets.size() > 0 )
{ {
@ -188,7 +183,7 @@ IntrusivePtr<Val> TopkVal::DoClone(CloneState* state)
return state->NewClone(this, std::move(clone)); return state->NewClone(this, std::move(clone));
} }
VectorVal* TopkVal::GetTopK(int k) const // returns vector IntrusivePtr<VectorVal> TopkVal::GetTopK(int k) const // returns vector
{ {
if ( numElements == 0 ) if ( numElements == 0 )
{ {
@ -225,7 +220,7 @@ VectorVal* TopkVal::GetTopK(int k) const // returns vector
it--; it--;
} }
return t.release(); return t;
} }
uint64_t TopkVal::GetCount(Val* value) const uint64_t TopkVal::GetCount(Val* value) const
@ -276,7 +271,7 @@ uint64_t TopkVal::GetSum() const
return sum; return sum;
} }
void TopkVal::Encountered(Val* encountered) void TopkVal::Encountered(IntrusivePtr<Val> encountered)
{ {
// ok, let's see if we already know this one. // ok, let's see if we already know this one.
@ -297,7 +292,7 @@ void TopkVal::Encountered(Val* encountered)
{ {
e = new Element(); e = new Element();
e->epsilon = 0; e->epsilon = 0;
e->value = encountered->Ref(); // or no ref? e->value = std::move(encountered);
// well, we do not know this one yet... // well, we do not know this one yet...
if ( numElements < size ) if ( numElements < size )
@ -437,7 +432,7 @@ broker::expected<broker::data> TopkVal::DoSerialize() const
{ {
Element* element = *eit; Element* element = *eit;
d.emplace_back(element->epsilon); d.emplace_back(element->epsilon);
auto v = bro_broker::val_to_data(element->value); auto v = bro_broker::val_to_data(element->value.get());
if ( ! v ) if ( ! v )
return broker::ec::invalid_data; return broker::ec::invalid_data;
@ -509,7 +504,7 @@ bool TopkVal::DoUnserialize(const broker::data& data)
Element* e = new Element(); Element* e = new Element();
e->epsilon = *epsilon; e->epsilon = *epsilon;
e->value = val.release(); e->value = std::move(val);
e->parent = b; e->parent = b;
b->elements.insert(b->elements.end(), e); b->elements.insert(b->elements.end(), e);

10
src/probabilistic/Topk.h
View file

@ -27,10 +27,8 @@ struct Bucket {
struct Element { struct Element {
uint64_t epsilon; uint64_t epsilon;
Val* value; IntrusivePtr<Val> value;
Bucket* parent; Bucket* parent;
~Element();
}; };
class TopkVal : public OpaqueVal { class TopkVal : public OpaqueVal {
@ -57,7 +55,7 @@ public:
* *
* @param value The encountered element * @param value The encountered element
*/ */
void Encountered(Val* value); void Encountered(IntrusivePtr<Val> value);
/** /**
* Get the first *k* elements of the result vector. At the moment, * Get the first *k* elements of the result vector. At the moment,
@ -68,7 +66,7 @@ public:
* *
* @returns The top-k encountered elements * @returns The top-k encountered elements
*/ */
VectorVal* GetTopK(int k) const; IntrusivePtr<VectorVal> GetTopK(int k) const;
/** /**
* Get the current count tracked in the top-k data structure for a * Get the current count tracked in the top-k data structure for a
@ -155,6 +153,8 @@ private:
* @returns HashKey for value * @returns HashKey for value
*/ */
HashKey* GetHash(Val* v) const; // this probably should go somewhere else. HashKey* GetHash(Val* v) const; // this probably should go somewhere else.
HashKey* GetHash(const IntrusivePtr<Val>& v) const
{ return GetHash(v.get()); }
/** /**
* Set the type that this TopK instance tracks * Set the type that this TopK instance tracks

4
src/probabilistic/top-k.bif
View file

@ -34,7 +34,7 @@ function topk_add%(handle: opaque of topk, value: any%): any
%{ %{
assert(handle); assert(handle);
probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle; probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle;
h->Encountered(value); h->Encountered({NewRef{}, value});
return nullptr; return nullptr;
%} %}
@ -53,7 +53,7 @@ function topk_get_top%(handle: opaque of topk, k: count%): any_vec
%{ %{
assert(handle); assert(handle);
probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle; probabilistic::TopkVal* h = (probabilistic::TopkVal*) handle;
return IntrusivePtr{AdoptRef{}, h->GetTopK(k)}; return h->GetTopK(k);
%} %}
## Get an overestimated count of how often a value has been encountered. ## Get an overestimated count of how often a value has been encountered.