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

streamlining of constructing script-level tables

Browse source
This commit is contained in:
Vern Paxson 2023-12-14 15:12:17 -08:00 • committed by Arne Welzel
parent d1d9b9a1be
commit a11ee9038b
4 changed files with 52 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/Val.cc
View file

@ -1568,7 +1568,6 @@ void TableVal::Init(TableTypePtr t, bool ordered) {
if ( table_type->IsPatternIndex() )
pattern_matcher = std::make_unique<detail::TablePatternMatcher>(this, table_type->Yield());
table_hash = new detail::CompositeHash(table_type->GetIndices());
if ( ordered )
table_val = new PDict<TableEntryVal>(DictOrder::ORDERED);
else
@ -1581,7 +1580,6 @@ TableVal::~TableVal() {
if ( timer )
detail::timer_mgr->Cancel(timer);
delete table_hash;
delete table_val;
delete expire_iterator;
}
@ -1756,7 +1754,7 @@ bool TableVal::AddTo(Val* val, bool is_first_init, bool propagate_ops) const {
auto* v = tble.value;
if ( is_first_init && t->AsTable()->Lookup(k.get()) ) {
auto key = table_hash->RecoverVals(*k);
auto key = GetTableHash()->RecoverVals(*k);
// ### Shouldn't complain if their values are equal.
key->Warn("multiple initializations for index");
continue;
@ -2081,7 +2079,7 @@ bool TableVal::UpdateTimestamp(Val* index) {
return true;
}
ListValPtr TableVal::RecreateIndex(const detail::HashKey& k) const { return table_hash->RecoverVals(k); }
ListValPtr TableVal::RecreateIndex(const detail::HashKey& k) const { return GetTableHash()->RecoverVals(k); }
void TableVal::CallChangeFunc(const ValPtr& index, const ValPtr& old_value, OnChangeType tpe) {
if ( ! change_func || ! index || in_change_func )
@ -2270,7 +2268,7 @@ ValPtr TableVal::Remove(const detail::HashKey& k, bool* iterators_invalidated) {
va = v->GetVal() ? v->GetVal() : IntrusivePtr{NewRef{}, this};
if ( subnets ) {
auto index = table_hash->RecoverVals(k);
auto index = GetTableHash()->RecoverVals(k);
if ( ! subnets->Remove(index.get()) )
reporter->InternalWarning("index not in prefix table");
@ -2281,7 +2279,7 @@ ValPtr TableVal::Remove(const detail::HashKey& k, bool* iterators_invalidated) {
Modified();
if ( va && (change_func || ! broker_store.empty()) ) {
auto index = table_hash->RecoverVals(k);
auto index = GetTableHash()->RecoverVals(k);
if ( ! broker_store.empty() )
SendToStore(index.get(), nullptr, ELEMENT_REMOVED);
@ -2297,7 +2295,7 @@ ListValPtr TableVal::ToListVal(TypeTag t) const {
for ( const auto& tble : *table_val ) {
auto k = tble.GetHashKey();
auto index = table_hash->RecoverVals(*k);
auto index = GetTableHash()->RecoverVals(*k);
if ( t == TYPE_ANY )
l->Append(std::move(index));
@ -2329,7 +2327,7 @@ std::unordered_map<ValPtr, ValPtr> TableVal::ToMap() const {
for ( const auto& iter : *table_val ) {
auto k = iter.GetHashKey();
auto v = iter.value;
auto vl = table_hash->RecoverVals(*k);
auto vl = GetTableHash()->RecoverVals(*k);
res[std::move(vl)] = v->GetVal();
}
@ -2366,7 +2364,7 @@ void TableVal::Describe(ODesc* d) const {
auto k = iter->GetHashKey();
auto* v = iter->value;
auto vl = table_hash->RecoverVals(*k);
auto vl = GetTableHash()->RecoverVals(*k);
int dim = vl->Length();
ODesc intermediary_d;
@ -2705,7 +2703,7 @@ unsigned int TableVal::ComputeFootprint(std::unordered_set<const Val*>* analyzed
for ( const auto& iter : *table_val ) {
auto k = iter.GetHashKey();
auto vl = table_hash->RecoverVals(*k);
auto vl = GetTableHash()->RecoverVals(*k);
auto v = iter.value->GetVal();
fp += vl->Footprint(analyzed_vals);
@ -2717,7 +2715,7 @@ unsigned int TableVal::ComputeFootprint(std::unordered_set<const Val*>* analyzed
}
std::unique_ptr<detail::HashKey> TableVal::MakeHashKey(const Val& index) const {
return table_hash->MakeHashKey(index, true);
return GetTableHash()->MakeHashKey(index, true);
}
void TableVal::SaveParseTimeTableState(RecordType* rt) {
@ -2733,8 +2731,17 @@ void TableVal::SaveParseTimeTableState(RecordType* rt) {
}
void TableVal::RebuildParseTimeTables() {
for ( auto& [tv, ptts] : parse_time_table_states )
std::set<TableType*> table_types; // regenerate hash just once per table type
for ( auto& [tv, ptts] : parse_time_table_states ) {
auto* tt = tv->table_type.get();
if ( table_types.count(tt) == 0 ) {
tt->RegenerateHash();
table_types.insert(tt);
}
tv->RebuildTable(std::move(ptts));
}
parse_time_table_states.clear();
}
@ -2755,9 +2762,6 @@ TableVal::ParseTimeTableState TableVal::DumpTableState() {
}
void TableVal::RebuildTable(ParseTimeTableState ptts) {
delete table_hash;
table_hash = new detail::CompositeHash(table_type->GetIndices());
for ( auto& [key, val] : ptts )
Assign(std::move(key), std::move(val));
}