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

Switch FuncType capture-list storage to optional<vector<Capture>>

Browse source 
May help clarify overall mem-mgmt/ownership semantics.
This commit is contained in:
Jon Siwek 2021-01-11 15:57:58 -08:00
parent ab15a98b28
commit b08112b2e7
8 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Func.cc
View file

@ -477,7 +477,7 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const
void ScriptFunc::CreateCaptures(Frame* f)
{
auto captures = type->GetCaptures();
const auto& captures = type->GetCaptures();
if ( ! captures )
return;
@ -490,27 +490,26 @@ void ScriptFunc::CreateCaptures(Frame* f)
captures_offset_mapping = new OffsetMap;
int offset = 0;
for ( auto c : *captures )
for ( const auto& c : *captures )
{
auto cid = c->id;
auto v = f->GetElementByID(cid);
auto v = f->GetElementByID(c.id);
if ( v )
{
if ( c->deep_copy || ! v->Modifiable() )
if ( c.deep_copy || ! v->Modifiable() )
v = v->Clone();
captures_frame->SetElement(offset, std::move(v));
}
(*captures_offset_mapping)[cid->Name()] = offset;
(*captures_offset_mapping)[c.id->Name()] = offset;
++offset;
}
}
void ScriptFunc::SetCaptures(Frame* f)
{
auto captures = type->GetCaptures();
const auto& captures = type->GetCaptures();
ASSERT(captures);
delete captures_frame;
@ -519,10 +518,9 @@ void ScriptFunc::SetCaptures(Frame* f)
captures_offset_mapping = new OffsetMap;
int offset = 0;
for ( auto c : *captures )
for ( const auto& c : *captures )
{
auto cid = c->id;
(*captures_offset_mapping)[cid->Name()] = offset;
(*captures_offset_mapping)[c.id->Name()] = offset;
++offset;
}
}
@ -600,7 +598,7 @@ void ScriptFunc::SetClosureFrame(Frame* f)
bool ScriptFunc::UpdateClosure(const broker::vector& data)
{
auto result = Frame::Unserialize(data, nullptr);
auto result = Frame::Unserialize(data, {});
if ( ! result.first )
return false;