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 2

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

30
src/Type.h
View file

@ -29,6 +29,7 @@ using TableValPtr = IntrusivePtr<TableVal>;
namespace detail {
class CompositeHash;
class Expr;
class ListExpr;
class Attributes;
@ -354,22 +355,20 @@ public:
void DescribeReST(ODesc* d, bool roles_only = false) const override;
// Returns true if this table is solely indexed by subnet.
bool IsSubNetIndex() const {
const auto& types = indices->GetTypes();
return types.size() == 1 && types[0]->Tag() == TYPE_SUBNET;
}
bool IsSubNetIndex() const { return is_subnet_index; }
// Returns true if this table has a single index of type pattern.
bool IsPatternIndex() const {
const auto& types = indices->GetTypes();
return types.size() == 1 && types[0]->Tag() == TYPE_PATTERN;
}
bool IsPatternIndex() const { return is_pattern_index; }
detail::TraversalCode Traverse(detail::TraversalCallback* cb) const override;
protected:
IndexType(TypeTag t, TypeListPtr arg_indices, TypePtr arg_yield_type)
: Type(t), indices(std::move(arg_indices)), yield_type(std::move(arg_yield_type)) {}
: Type(t), indices(std::move(arg_indices)), yield_type(std::move(arg_yield_type)) {
const auto& types = indices->GetTypes();
is_subnet_index = types.size() == 1 && types[0]->Tag() == TYPE_SUBNET;
is_pattern_index = types.size() == 1 && types[0]->Tag() == TYPE_PATTERN;
}
~IndexType() override = default;
@ -377,12 +376,17 @@ protected:
TypeListPtr indices;
TypePtr yield_type;
bool is_subnet_index;
bool is_pattern_index;
};
class TableType : public IndexType {
public:
TableType(TypeListPtr ind, TypePtr yield);
~TableType();
/**
* Assesses whether an &expire_func attribute's function type is compatible
* with this table type.
@ -398,9 +402,17 @@ public:
// what one gets using an empty "set()" or "table()" constructor.
bool IsUnspecifiedTable() const;
const detail::CompositeHash* GetTableHash() const { return table_hash; }
// Called to rebuild the associated hash function when a record type
// (that this table type depends on) gets redefined during parsing.
void RegenerateHash();
private:
bool DoExpireCheck(const detail::AttrPtr& attr);
detail::CompositeHash* table_hash = nullptr;
// Used to prevent repeated error messages.
bool reported_error = false;
};