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

Val: use class IntrusivePtr in class TableEntryVal

Browse source
This commit is contained in:
Max Kellermann 2020-03-02 19:52:47 +01:00
parent 7924e948b9
commit 93c2064b9a
2 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Val.cc
View file

@ -1295,7 +1295,7 @@ unsigned int ListVal::MemoryAllocation() const
TableEntryVal* TableEntryVal::Clone(Val::CloneState* state) TableEntryVal* TableEntryVal::Clone(Val::CloneState* state)
{ {
auto rval = new TableEntryVal(val ? val->Clone(state).release() : nullptr); auto rval = new TableEntryVal(val ? val->Clone(state) : nullptr);
rval->last_access_time = last_access_time; rval->last_access_time = last_access_time;
rval->expire_access_time = expire_access_time; rval->expire_access_time = expire_access_time;
return rval; return rval;
@ -1323,7 +1323,6 @@ void TableValTimer::Dispatch(double t, int is_expire)
static void table_entry_val_delete_func(void* val) static void table_entry_val_delete_func(void* val)
{ {
TableEntryVal* tv = (TableEntryVal*) val; TableEntryVal* tv = (TableEntryVal*) val;
tv->Unref();
delete tv; delete tv;
} }
@ -1483,7 +1482,7 @@ int TableVal::Assign(Val* index, HashKey* k, IntrusivePtr<Val> new_val)
if ( (is_set && new_val) || (! is_set && ! new_val) ) if ( (is_set && new_val) || (! is_set && ! new_val) )
InternalWarning("bad set/table in TableVal::Assign"); InternalWarning("bad set/table in TableVal::Assign");
TableEntryVal* new_entry_val = new TableEntryVal(IntrusivePtr{new_val}.release()); TableEntryVal* new_entry_val = new TableEntryVal(new_val);
HashKey k_copy(k->Key(), k->Size(), k->Hash()); HashKey k_copy(k->Key(), k->Size(), k->Hash());
TableEntryVal* old_entry_val = AsNonConstTable()->Insert(k, new_entry_val); TableEntryVal* old_entry_val = AsNonConstTable()->Insert(k, new_entry_val);
@ -1519,11 +1518,7 @@ int TableVal::Assign(Val* index, HashKey* k, IntrusivePtr<Val> new_val)
Unref(change_index); Unref(change_index);
} }
if ( old_entry_val )
{
old_entry_val->Unref();
delete old_entry_val; delete old_entry_val;
}
return 1; return 1;
} }
@ -1581,8 +1576,7 @@ int TableVal::AddTo(Val* val, int is_first_init, bool propagate_ops) const
} }
else else
{ {
v->Ref(); if ( ! t->Assign(0, k, {NewRef{}, v->Value()}) )
if ( ! t->Assign(0, k, v->Value()) )
return 0; return 0;
} }
} }
@ -1647,7 +1641,7 @@ TableVal* TableVal::Intersect(const TableVal* tv) const
// Here we leverage the same assumption about consistent // Here we leverage the same assumption about consistent
// hashes as in TableVal::RemoveFrom above. // hashes as in TableVal::RemoveFrom above.
if ( t0->Lookup(k) ) if ( t0->Lookup(k) )
t2->Insert(k, new TableEntryVal(0)); t2->Insert(k, new TableEntryVal(nullptr));
delete k; delete k;
} }
@ -2023,7 +2017,7 @@ Val* TableVal::Delete(const Val* index)
{ {
HashKey* k = ComputeHash(index); HashKey* k = ComputeHash(index);
TableEntryVal* v = k ? AsNonConstTable()->RemoveEntry(k) : 0; TableEntryVal* v = k ? AsNonConstTable()->RemoveEntry(k) : 0;
Val* va = v ? (v->Value() ? v->Value() : this->Ref()) : 0; IntrusivePtr<Val> va{NewRef{}, v ? (v->Value() ? v->Value() : this) : nullptr};
if ( subnets && ! subnets->Remove(index) ) if ( subnets && ! subnets->Remove(index) )
reporter->InternalWarning("index not in prefix table"); reporter->InternalWarning("index not in prefix table");
@ -2034,15 +2028,15 @@ Val* TableVal::Delete(const Val* index)
Modified(); Modified();
if ( change_func ) if ( change_func )
CallChangeFunc(index, va, ELEMENT_REMOVED); CallChangeFunc(index, va.get(), ELEMENT_REMOVED);
return va; return va.release();
} }
Val* TableVal::Delete(const HashKey* k) Val* TableVal::Delete(const HashKey* k)
{ {
TableEntryVal* v = AsNonConstTable()->RemoveEntry(k); TableEntryVal* v = AsNonConstTable()->RemoveEntry(k);
Val* va = v ? (v->Value() ? v->Value() : this->Ref()) : 0; IntrusivePtr<Val> va{NewRef{}, v ? (v->Value() ? v->Value() : this) : nullptr};
if ( subnets ) if ( subnets )
{ {
@ -2058,10 +2052,10 @@ Val* TableVal::Delete(const HashKey* k)
if ( change_func && va ) if ( change_func && va )
{ {
auto index = table_hash->RecoverVals(k); auto index = table_hash->RecoverVals(k);
CallChangeFunc(index.get(), va->Ref(), ELEMENT_REMOVED); CallChangeFunc(index.get(), va.get(), ELEMENT_REMOVED);
} }
return va; return va.release();
} }
ListVal* TableVal::ConvertToList(TypeTag t) const ListVal* TableVal::ConvertToList(TypeTag t) const
@ -2354,7 +2348,6 @@ void TableVal::DoExpire(double t)
CallChangeFunc(idx, v->Value(), ELEMENT_EXPIRED); CallChangeFunc(idx, v->Value(), ELEMENT_EXPIRED);
} }
Unref(idx); Unref(idx);
Unref(v->Value());
delete v; delete v;
modified = true; modified = true;
} }

16
src/Val.h
View file

@ -2,6 +2,7 @@
#pragma once #pragma once
#include "IntrusivePtr.h"
#include "Type.h" #include "Type.h"
#include "Timer.h" #include "Timer.h"
#include "Notifier.h" #include "Notifier.h"
@ -27,9 +28,7 @@ using std::string;
#define UDP_PORT_MASK 0x20000 #define UDP_PORT_MASK 0x20000
#define ICMP_PORT_MASK 0x30000 #define ICMP_PORT_MASK 0x30000
template <class T> class IntrusivePtr;
template<typename T> class PDict; template<typename T> class PDict;
template <class T> class IntrusivePtr;
class IterCookie; class IterCookie;
class Val; class Val;
@ -644,9 +643,10 @@ extern double bro_start_network_time;
class TableEntryVal { class TableEntryVal {
public: public:
explicit TableEntryVal(Val* v) template<typename V>
explicit TableEntryVal(V&& v)
: val(std::forward<V>(v))
{ {
val = v;
last_access_time = network_time; last_access_time = network_time;
expire_access_time = expire_access_time =
int(network_time - bro_start_network_time); int(network_time - bro_start_network_time);
@ -654,11 +654,7 @@ public:
TableEntryVal* Clone(Val::CloneState* state); TableEntryVal* Clone(Val::CloneState* state);
~TableEntryVal() { } Val* Value() { return val.get(); }
Val* Value() { return val; }
void Ref() { val->Ref(); }
void Unref() { ::Unref(val); }
// Returns/sets time of last expiration relevant access to this value. // Returns/sets time of last expiration relevant access to this value.
double ExpireAccessTime() const double ExpireAccessTime() const
@ -669,7 +665,7 @@ public:
protected: protected:
friend class TableVal; friend class TableVal;
Val* val; IntrusivePtr<Val> val;
double last_access_time; double last_access_time;
// The next entry stores seconds since Bro's start. We use ints here // The next entry stores seconds since Bro's start. We use ints here