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

Factor static-local nil IntrusivePtrs to global locations

Browse source 
Minor optimization to remove any run-time impact.
This commit is contained in:
Jon Siwek 2020-05-21 17:22:39 -07:00
parent a384bb8b81
commit ea878208ba
8 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Val.cc
View file

@ -1897,9 +1897,6 @@ IntrusivePtr<Val> TableVal::Default(const IntrusivePtr<Val>& index)
const IntrusivePtr<Val>& TableVal::Find(const IntrusivePtr<Val>& index)
{
static IntrusivePtr<Val> nil;
static IntrusivePtr<Val> exists = val_mgr->True();
if ( subnets )
{
TableEntryVal* v = (TableEntryVal*) subnets->Lookup(index.get());
@ -1911,10 +1908,10 @@ const IntrusivePtr<Val>& TableVal::Find(const IntrusivePtr<Val>& index)
if ( v->GetVal() )
return v->GetVal();
return exists;
return val_mgr->True();
}
return nil;
return Val::nil;
}
const PDict<TableEntryVal>* tbl = AsTable();
@ -1935,12 +1932,12 @@ const IntrusivePtr<Val>& TableVal::Find(const IntrusivePtr<Val>& index)
if ( v->GetVal() )
return v->GetVal();
return exists;
return val_mgr->True();
}
}
}
return nil;
return Val::nil;
}
IntrusivePtr<Val> TableVal::FindOrDefault(const IntrusivePtr<Val>& index)
@ -3139,10 +3136,8 @@ bool VectorVal::AddTo(Val* val, bool /* is_first_init */) const
const IntrusivePtr<Val>& VectorVal::At(unsigned int index) const
{
static IntrusivePtr<Val> nil;
if ( index >= val.vector_val->size() )
return nil;
return Val::nil;
return (*val.vector_val)[index];
}