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

Switch a TableVal::CallChangeFunc param to IntrusivePtr

Browse source
This commit is contained in:
Jon Siwek 2020-05-20 23:17:25 -07:00
parent 9798c4b763
commit adb9d2881c
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Val.cc
View file

@ -1561,8 +1561,8 @@ bool TableVal::Assign(IntrusivePtr<Val> index, std::unique_ptr<HashKey> k,
if ( change_func ) if ( change_func )
{ {
auto change_index = index ? std::move(index) : RecreateIndex(k_copy); auto change_index = index ? std::move(index) : RecreateIndex(k_copy);
auto v = old_entry_val ? old_entry_val->GetVal() : new_entry_val->GetVal(); const auto& v = old_entry_val ? old_entry_val->GetVal() : new_entry_val->GetVal();
CallChangeFunc(change_index.get(), v.get(), old_entry_val ? ELEMENT_CHANGED : ELEMENT_NEW); CallChangeFunc(change_index.get(), v, old_entry_val ? ELEMENT_CHANGED : ELEMENT_NEW);
} }
delete old_entry_val; delete old_entry_val;
@ -2030,7 +2030,9 @@ IntrusivePtr<ListVal> TableVal::RecreateIndex(const HashKey& k) const
return table_hash->RecoverVals(k); return table_hash->RecoverVals(k);
} }
void TableVal::CallChangeFunc(const Val* index, Val* old_value, OnChangeType tpe) void TableVal::CallChangeFunc(const Val* index,
const IntrusivePtr<Val>& old_value,
OnChangeType tpe)
{ {
if ( ! change_func || ! index || in_change_func ) if ( ! change_func || ! index || in_change_func )
return; return;
@ -2079,7 +2081,7 @@ void TableVal::CallChangeFunc(const Val* index, Val* old_value, OnChangeType tpe
vl.emplace_back(v); vl.emplace_back(v);
if ( table_type->IsTable() ) if ( table_type->IsTable() )
vl.emplace_back(NewRef{}, old_value); vl.emplace_back(old_value);
in_change_func = true; in_change_func = true;
f->operator()(vl); f->operator()(vl);
@ -2108,7 +2110,7 @@ IntrusivePtr<Val> TableVal::Remove(const Val& index)
Modified(); Modified();
if ( change_func ) if ( change_func )
CallChangeFunc(&index, va.get(), ELEMENT_REMOVED); CallChangeFunc(&index, va, ELEMENT_REMOVED);
return va; return va;
} }
@ -2136,7 +2138,7 @@ IntrusivePtr<Val> TableVal::Remove(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.get(), ELEMENT_REMOVED); CallChangeFunc(index.get(), va, ELEMENT_REMOVED);
} }
return va; return va;
@ -2439,7 +2441,7 @@ void TableVal::DoExpire(double t)
{ {
if ( ! idx ) if ( ! idx )
idx = RecreateIndex(*k); idx = RecreateIndex(*k);
CallChangeFunc(idx.get(), v->GetVal().get(), ELEMENT_EXPIRED); CallChangeFunc(idx.get(), v->GetVal(), ELEMENT_EXPIRED);
} }
delete v; delete v;

3
src/Val.h
View file

@ -1017,7 +1017,8 @@ protected:
enum OnChangeType { ELEMENT_NEW, ELEMENT_CHANGED, ELEMENT_REMOVED, ELEMENT_EXPIRED }; enum OnChangeType { ELEMENT_NEW, ELEMENT_CHANGED, ELEMENT_REMOVED, ELEMENT_EXPIRED };
// Calls &change_func. Does not take ownership of values. (Refs if needed). // Calls &change_func. Does not take ownership of values. (Refs if needed).
void CallChangeFunc(const Val* index, Val* old_value, OnChangeType tpe); void CallChangeFunc(const Val* index, const IntrusivePtr<Val>& old_value,
OnChangeType tpe);
IntrusivePtr<Val> DoClone(CloneState* state) override; IntrusivePtr<Val> DoClone(CloneState* state) override;