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

Remove BroValUnion by hoisting underlying Val subclass values into subclasses

Browse source
This commit is contained in:
Vern Paxson 2020-11-10 15:18:54 -08:00 • committed by Tim Wojtulewicz
parent 49ca8e2163
commit 7f92a573d2
29 changed files with 632 additions and 512 deletions
Download patch file Download diff file Expand all files Collapse all files

2
auxil/bifcl

@ -1 +1 @@
Subproject commit 624e5525f54d4a15c35687d42301045f1769d3e1
Subproject commit e72531a9efe4e6edb1589cb07ae41053023d0612

10
src/CompHash.cc
View file

@ -101,7 +101,7 @@ char* CompositeHash::SingleValHash(bool type_check, char* kp0,
case TYPE_INTERNAL_INT:
{
bro_int_t* kp = AlignAndPadType<bro_int_t>(kp0);
*kp = v->ForceAsInt();
*kp = v->AsInt();
kp1 = reinterpret_cast<char*>(kp+1);
}
break;
@ -109,7 +109,7 @@ char* CompositeHash::SingleValHash(bool type_check, char* kp0,
case TYPE_INTERNAL_UNSIGNED:
{
bro_uint_t* kp = AlignAndPadType<bro_uint_t>(kp0);
*kp = v->ForceAsUInt();
*kp = v->AsCount();
kp1 = reinterpret_cast<char*>(kp+1);
}
break;
@ -407,8 +407,10 @@ std::unique_ptr<HashKey> CompositeHash::ComputeSingletonHash(const Val* v, bool
switch ( singleton_tag ) {
case TYPE_INTERNAL_INT:
return std::make_unique<HashKey>(v->AsInt());
case TYPE_INTERNAL_UNSIGNED:
return std::make_unique<HashKey>(v->ForceAsInt());
return std::make_unique<HashKey>(v->AsCount());
case TYPE_INTERNAL_ADDR:
return v->AsAddr().MakeHashKey();
@ -855,7 +857,7 @@ const char* CompositeHash::RecoverOneVal(
if ( ! f )
reporter->InternalError("failed to look up unique function id %" PRIu32 " in CompositeHash::RecoverOneVal()", *kp);
*pval = make_intrusive<Val>(f);
*pval = make_intrusive<FuncVal>(f);
const auto& pvt = (*pval)->GetType();
if ( ! pvt )

2
src/Conn.cc
View file

@ -434,7 +434,7 @@ void Connection::AppendAddl(const char* str)
{
const auto& cv = ConnVal();
const char* old = cv->GetField(6)->AsString()->CheckString();
const char* old = cv->GetStringField(6)->CheckString();
const char* format = *old ? "%s %s" : "%s%s";
cv->Assign(6, make_intrusive<StringVal>(util::fmt(format, old, str)));

8
src/Expr.cc
View file

@ -1853,7 +1853,7 @@ ValPtr EqExpr::Fold(Val* v1, Val* v2) const
{
if ( op1->GetType()->Tag() == TYPE_PATTERN )
{
RE_Matcher* re = v1->AsPattern();
auto re = dynamic_cast<PatternVal*>(v1);
const String* s = v2->AsString();
if ( tag == EXPR_EQ )
return val_mgr->Bool(re->MatchExactly(s));
@ -4151,7 +4151,7 @@ ValPtr InExpr::Fold(Val* v1, Val* v2) const
{
if ( v1->GetType()->Tag() == TYPE_PATTERN )
{
RE_Matcher* re = v1->AsPattern();
auto re = dynamic_cast<PatternVal*>(v1);
const String* s = v2->AsString();
return val_mgr->Bool(re->MatchAnywhere(s) != 0);
}
@ -4412,7 +4412,7 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
// Update lamb's name
dummy_func->SetName(my_name.c_str());
auto v = make_intrusive<Val>(std::move(dummy_func));
auto v = make_intrusive<FuncVal>(std::move(dummy_func));
id->SetVal(std::move(v));
id->SetType(ingredients->id->GetType());
id->SetConst();
@ -4502,7 +4502,7 @@ ValPtr LambdaExpr::Eval(Frame* f) const
// Allows for lookups by the receiver.
lamb->SetName(my_name.c_str());
return make_intrusive<Val>(std::move(lamb));
return make_intrusive<FuncVal>(std::move(lamb));
}
void LambdaExpr::ExprDescribe(ODesc* d) const

2
src/File.cc
View file

@ -331,7 +331,7 @@ void File::RaiseOpenEvent()
return;
FilePtr bf{NewRef{}, this};
auto* event = new Event(::file_opened, {make_intrusive<Val>(std::move(bf))});
auto* event = new Event(::file_opened, {make_intrusive<FileVal>(std::move(bf))});
event_mgr.Dispatch(event, true);
}

2
src/Func.cc
View file

@ -702,7 +702,7 @@ BuiltinFunc::BuiltinFunc(built_in_func arg_func, const char* arg_name,
reporter->InternalError("built-in function %s multiply defined", Name());
type = id->GetType<FuncType>();
id->SetVal(make_intrusive<Val>(IntrusivePtr{NewRef{}, this}));
id->SetVal(make_intrusive<FuncVal>(IntrusivePtr{NewRef{}, this}));
id->SetConst();
}

7
src/ID.cc
View file

@ -87,7 +87,7 @@ FuncPtr id::find_func(std::string_view name)
reporter->InternalError("Expected variable '%s' to be a function",
std::string(name).data());
return v->AsFuncPtr();
return dynamic_cast<FuncVal*>(v.get())->AsFuncPtr();
}
void id::detail::init_types()
@ -162,17 +162,18 @@ void ID::SetVal(ValPtr v)
type->AsFuncType()->Flavor() == FUNC_FLAVOR_EVENT )
{
EventHandler* handler = event_registry->Lookup(name);
auto func = dynamic_cast<FuncVal*>(val.get())->AsFuncPtr();
if ( ! handler )
{
handler = new EventHandler(name);
handler->SetFunc(val->AsFuncPtr());
handler->SetFunc(func);
event_registry->Register(handler);
}
else
{
// Otherwise, internally defined events cannot
// have local handler.
handler->SetFunc(val->AsFuncPtr());
handler->SetFunc(func);
}
}
}

10
src/Reporter.cc
View file

@ -369,11 +369,11 @@ bool Reporter::PermitFlowWeird(const char* name,
bool Reporter::PermitExpiredConnWeird(const char* name, const RecordVal& conn_id)
{
auto conn_tuple = std::make_tuple(conn_id.GetField("orig_h")->AsAddr(),
conn_id.GetField("resp_h")->AsAddr(),
conn_id.GetField("orig_p")->AsPortVal()->Port(),
conn_id.GetField("resp_p")->AsPortVal()->Port(),
conn_id.GetField("resp_p")->AsPortVal()->PortType());
auto conn_tuple = std::make_tuple(conn_id.GetAddrField("orig_h"),
conn_id.GetAddrField("resp_h"),
conn_id.GetPortValField("orig_p")->Port(),
conn_id.GetPortValField("resp_p")->Port(),
conn_id.GetPortValField("resp_p")->PortType());
auto& map = expired_conn_weird_state[conn_tuple];

10
src/Sessions.cc
View file

@ -318,7 +318,7 @@ Connection* NetSessions::FindConnection(Val* v)
return nullptr;
RecordType* vr = vt->AsRecordType();
auto vl = v->AsRecord();
auto vl = dynamic_cast<RecordVal*>(v);
int orig_h, orig_p; // indices into record's value list
int resp_h, resp_p;
@ -346,11 +346,11 @@ Connection* NetSessions::FindConnection(Val* v)
// types, too.
}
const IPAddr& orig_addr = (*vl)[orig_h]->AsAddr();
const IPAddr& resp_addr = (*vl)[resp_h]->AsAddr();
const IPAddr& orig_addr = vl->GetAddrField(orig_h);
const IPAddr& resp_addr = vl->GetAddrField(resp_h);
PortVal* orig_portv = (*vl)[orig_p]->AsPortVal();
PortVal* resp_portv = (*vl)[resp_p]->AsPortVal();
const PortVal* orig_portv = vl->GetPortValField(orig_p);
const PortVal* resp_portv = vl->GetPortValField(resp_p);
ConnID id;

8
src/SmithWaterman.cc
View file

@ -109,19 +109,19 @@ Substring::Vec* Substring::VecFromPolicy(VectorVal* vec)
if ( ! v )
continue;
const String* str = v->AsRecordVal()->GetField(0)->AsString();
const String* str = v->AsRecordVal()->GetStringField(0);
auto* substr = new Substring(*str);
const VectorVal* aligns = v->AsRecordVal()->GetField(1)->AsVectorVal();
for ( unsigned int j = 1; j <= aligns->Size(); ++j )
{
const RecordVal* align = aligns->AsVectorVal()->At(j)->AsRecordVal();
const String* str = align->GetField(0)->AsString();
int index = align->GetField(1)->AsCount();
const String* str = align->GetStringField(0);
int index = align->GetCountField(1);
substr->AddAlignment(str, index);
}
bool new_alignment = v->AsRecordVal()->GetField(2)->AsBool();
bool new_alignment = v->AsRecordVal()->GetBoolField(2);
substr->MarkNewAlignment(new_alignment);
result->push_back(substr);

2
src/Stats.cc
View file

@ -324,7 +324,7 @@ void ProfileLogger::Log()
if ( profiling_update )
{
event_mgr.Dispatch(new Event(profiling_update, {
make_intrusive<Val>(IntrusivePtr{NewRef{}, file}),
make_intrusive<FileVal>(IntrusivePtr{NewRef{}, file}),
val_mgr->Bool(expensive),
}));
}

525
src/Val.cc
View file

File diff suppressed because it is too large Load diff

430
src/Val.h
View file

@ -88,67 +88,21 @@ using TableValPtr = IntrusivePtr<TableVal>;
using ValPtr = IntrusivePtr<Val>;
using VectorValPtr = IntrusivePtr<VectorVal>;
union BroValUnion {
// Used for bool, int, enum.
bro_int_t int_val;
// Used for count, counter, port.
bro_uint_t uint_val;
// Used for addr
IPAddr* addr_val;
// Used for subnet
IPPrefix* subnet_val;
// Used for double, time, interval.
double double_val;
String* string_val;
Func* func_val;
File* file_val;
RE_Matcher* re_val;
PDict<TableEntryVal>* table_val;
std::vector<ValPtr>* record_val;
std::vector<ValPtr>* vector_val;
BroValUnion() = default;
constexpr BroValUnion(bro_int_t value) noexcept
: int_val(value) {}
constexpr BroValUnion(bro_uint_t value) noexcept
: uint_val(value) {}
constexpr BroValUnion(IPAddr* value) noexcept
: addr_val(value) {}
constexpr BroValUnion(IPPrefix* value) noexcept
: subnet_val(value) {}
constexpr BroValUnion(double value) noexcept
: double_val(value) {}
constexpr BroValUnion(String* value) noexcept
: string_val(value) {}
constexpr BroValUnion(Func* value) noexcept
: func_val(value) {}
constexpr BroValUnion(File* value) noexcept
: file_val(value) {}
constexpr BroValUnion(RE_Matcher* value) noexcept
: re_val(value) {}
constexpr BroValUnion(PDict<TableEntryVal>* value) noexcept
: table_val(value) {}
};
class Val : public Obj {
public:
static inline const ValPtr nil;
#ifdef DEPRECATED
// We need to decide whether to keep these. It will be a pain
// since it's no longer possible to build these as Val objects.
// Instead, we'd need to (1) extend Val's to include an optional
// pointer-to-another-Val, (2) implement these constructors by
// constructing the proper Val subclass in addition, tracking
// it using the pointer, (3) redirect calls to the dependent methods
// to go to the subclass instead (tricky to get right), (4) destruct
// the additional subclass (easy), and (5) figure out how to test
// whether all the surgery works (seems quite hard).
[[deprecated("Remove in v4.1. Use IntervalVal(), TimeVal(), or DoubleVal() constructors.")]]
Val(double d, TypeTag t)
: val(d), type(base_type(t))
@ -163,6 +117,7 @@ public:
// Note, the file will be closed after this Val is destructed if there's
// no other remaining references.
explicit Val(FilePtr f);
#endif
// Extra arg to differentiate from protected version.
Val(TypePtr t, bool type_type)
@ -174,7 +129,7 @@ public:
{}
Val()
: val(bro_int_t(0)), type(base_type(TYPE_ERROR))
: type(base_type(TYPE_ERROR))
{}
~Val() override;
@ -221,41 +176,23 @@ public:
IntrusivePtr<T> GetType() const
{ return cast_intrusive<T>(type); }
#define CONST_ACCESSOR(tag, ctype, accessor, name) \
const ctype name() const \
{ \
CHECK_TAG(type->Tag(), tag, "Val::CONST_ACCESSOR", type_name) \
return val.accessor; \
}
#define UNDERLYING_ACCESSOR_DECL(ztype, ctype, name) \
ctype name() const;
// Needed for g++ 4.3's pickiness.
#define CONST_ACCESSOR2(tag, ctype, accessor, name) \
ctype name() const \
{ \
CHECK_TAG(type->Tag(), tag, "Val::CONST_ACCESSOR", type_name) \
return val.accessor; \
}
CONST_ACCESSOR2(TYPE_BOOL, bool, int_val, AsBool)
CONST_ACCESSOR2(TYPE_INT, bro_int_t, int_val, AsInt)
CONST_ACCESSOR2(TYPE_COUNT, bro_uint_t, uint_val, AsCount)
CONST_ACCESSOR2(TYPE_DOUBLE, double, double_val, AsDouble)
CONST_ACCESSOR2(TYPE_TIME, double, double_val, AsTime)
CONST_ACCESSOR2(TYPE_INTERVAL, double, double_val, AsInterval)
CONST_ACCESSOR2(TYPE_ENUM, int, int_val, AsEnum)
CONST_ACCESSOR(TYPE_STRING, String*, string_val, AsString)
CONST_ACCESSOR(TYPE_FUNC, Func*, func_val, AsFunc)
CONST_ACCESSOR(TYPE_TABLE, PDict<TableEntryVal>*, table_val, AsTable)
CONST_ACCESSOR(TYPE_RECORD, std::vector<ValPtr>*, record_val, AsRecord)
CONST_ACCESSOR(TYPE_FILE, File*, file_val, AsFile)
CONST_ACCESSOR(TYPE_PATTERN, RE_Matcher*, re_val, AsPattern)
CONST_ACCESSOR(TYPE_VECTOR, std::vector<ValPtr>*, vector_val, AsVector)
const IPPrefix& AsSubNet() const
{
CHECK_TAG(type->Tag(), TYPE_SUBNET, "Val::SubNet", type_name)
return *val.subnet_val;
}
UNDERLYING_ACCESSOR_DECL(IntVal, bro_int_t, AsInt)
UNDERLYING_ACCESSOR_DECL(BoolVal, bool, AsBool)
UNDERLYING_ACCESSOR_DECL(EnumVal, int, AsEnum)
UNDERLYING_ACCESSOR_DECL(CountVal, bro_uint_t, AsCount)
UNDERLYING_ACCESSOR_DECL(DoubleVal, double, AsDouble)
UNDERLYING_ACCESSOR_DECL(TimeVal, double, AsTime)
UNDERLYING_ACCESSOR_DECL(IntervalVal, double, AsInterval)
UNDERLYING_ACCESSOR_DECL(AddrVal, const IPAddr&, AsAddr)
UNDERLYING_ACCESSOR_DECL(SubNetVal, const IPPrefix&, AsSubNet)
UNDERLYING_ACCESSOR_DECL(StringVal, const String*, AsString)
UNDERLYING_ACCESSOR_DECL(FuncVal, Func*, AsFunc)
UNDERLYING_ACCESSOR_DECL(FileVal, File*, AsFile)
UNDERLYING_ACCESSOR_DECL(PatternVal, const RE_Matcher*, AsPattern)
UNDERLYING_ACCESSOR_DECL(TableVal, const PDict<TableEntryVal>*, AsTable)
zeek::Type* AsType() const
{
@ -263,48 +200,6 @@ public:
return type.get();
}
const IPAddr& AsAddr() const
{
if ( type->Tag() != TYPE_ADDR )
BadTag("Val::AsAddr", type_name(type->Tag()));
return *val.addr_val;
}
#define ACCESSOR(tag, ctype, accessor, name) \
ctype name() \
{ \
CHECK_TAG(type->Tag(), tag, "Val::ACCESSOR", type_name) \
return val.accessor; \
}
// Accessors for mutable values are called AsNonConst* and
// are protected to avoid external state changes.
// ACCESSOR(TYPE_STRING, String*, string_val, AsString)
ACCESSOR(TYPE_FUNC, Func*, func_val, AsFunc)
ACCESSOR(TYPE_FILE, File*, file_val, AsFile)
ACCESSOR(TYPE_PATTERN, RE_Matcher*, re_val, AsPattern)
ACCESSOR(TYPE_VECTOR, std::vector<ValPtr>*, vector_val, AsVector)
FuncPtr AsFuncPtr() const;
const IPPrefix& AsSubNet()
{
CHECK_TAG(type->Tag(), TYPE_SUBNET, "Val::SubNet", type_name)
return *val.subnet_val;
}
const IPAddr& AsAddr()
{
if ( type->Tag() != TYPE_ADDR )
BadTag("Val::AsAddr", type_name(type->Tag()));
return *val.addr_val;
}
// Gives fast access to the bits of something that is one of
// bool, int, count, or counter.
bro_int_t ForceAsInt() const { return val.int_val; }
bro_uint_t ForceAsUInt() const { return val.uint_val; }
PatternVal* AsPatternVal();
const PatternVal* AsPatternVal() const;
@ -361,6 +256,7 @@ public:
protected:
// Friends with access to Clone().
friend class EnumType;
friend class ListVal;
friend class RecordVal;
@ -375,23 +271,10 @@ protected:
static ValPtr MakeInt(bro_int_t i);
static ValPtr MakeCount(bro_uint_t u);
template<typename V>
Val(V&& v, TypeTag t) noexcept
: val(std::forward<V>(v)), type(base_type(t))
{}
template<typename V>
Val(V&& v, TypePtr t) noexcept
: val(std::forward<V>(v)), type(std::move(t))
{}
explicit Val(TypePtr t) noexcept
: type(std::move(t))
{}
ACCESSOR(TYPE_TABLE, PDict<TableEntryVal>*, table_val, AsNonConstTable)
ACCESSOR(TYPE_RECORD, std::vector<ValPtr>*, record_val, AsNonConstRecord)
// For internal use by the Val::Clone() methods.
struct CloneState {
// Caches a cloned value for later reuse during the same
@ -405,7 +288,6 @@ protected:
ValPtr Clone(CloneState* state);
virtual ValPtr DoClone(CloneState* state);
BroValUnion val;
TypePtr type;
#ifdef DEBUG
@ -505,6 +387,67 @@ private:
extern ValManager* val_mgr;
class IntVal : public Val {
public:
IntVal(bro_int_t v)
: Val(base_type(TYPE_INT)), int_val(v)
{}
bro_int_t UnderlyingVal() const { return int_val; }
protected:
IntVal(bro_int_t v, TypePtr t)
: Val(std::move(t)), int_val(v)
{}
bro_int_t int_val;
};
class BoolVal final : public IntVal {
public:
BoolVal(bro_int_t v)
: IntVal(v, base_type(TYPE_BOOL))
{}
BoolVal(bool b)
: BoolVal(bro_int_t(b))
{}
bool UnderlyingVal() const { return int_val; }
};
class CountVal : public Val {
public:
CountVal(bro_uint_t v)
: Val(base_type(TYPE_COUNT)), uint_val(v)
{}
bro_uint_t UnderlyingVal() const { return uint_val; }
protected:
CountVal(bro_uint_t v, TypePtr t)
: Val(std::move(t)), uint_val(v)
{}
bro_int_t uint_val;
};
class DoubleVal : public Val {
public:
DoubleVal(double v)
: Val(base_type(TYPE_DOUBLE)), double_val(v)
{}
double UnderlyingVal() const { return double_val; }
protected:
DoubleVal(double v, TypePtr t)
: Val(std::move(t)), double_val(v)
{}
private:
double double_val;
};
#define Microseconds 1e-6
#define Milliseconds 1e-3
#define Seconds 1.0
@ -512,31 +455,24 @@ extern ValManager* val_mgr;
#define Hours (60*Minutes)
#define Days (24*Hours)
class IntervalVal final : public Val {
class IntervalVal final : public DoubleVal {
public:
IntervalVal(double quantity, double units = Seconds)
: Val(quantity * units, base_type(TYPE_INTERVAL))
: DoubleVal(quantity * units, base_type(TYPE_INTERVAL))
{}
protected:
void ValDescribe(ODesc* d) const override;
};
class TimeVal final : public Val {
class TimeVal final : public DoubleVal {
public:
TimeVal(double t)
: Val(t, base_type(TYPE_TIME))
: DoubleVal(t, base_type(TYPE_TIME))
{}
};
class DoubleVal final : public Val {
public:
DoubleVal(double v)
: Val(v, base_type(TYPE_DOUBLE))
{}
};
class PortVal final : public Val {
class PortVal final : public CountVal {
public:
ValPtr SizeVal() const override;
@ -585,10 +521,15 @@ public:
explicit AddrVal(const uint32_t addr[4]); // IPv6.
explicit AddrVal(const IPAddr& addr);
const IPAddr& UnderlyingVal() const { return *addr_val; }
unsigned int MemoryAllocation() const override;
protected:
ValPtr DoClone(CloneState* state) override;
private:
IPAddr* addr_val;
};
class SubNetVal final : public Val {
@ -609,11 +550,16 @@ public:
bool Contains(const IPAddr& addr) const;
const IPPrefix& UnderlyingVal() const { return *subnet_val; }
unsigned int MemoryAllocation() const override;
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
IPPrefix* subnet_val;
};
class StringVal final : public Val {
@ -622,6 +568,7 @@ public:
explicit StringVal(const char* s);
explicit StringVal(const std::string& s);
StringVal(int length, const char* s);
~StringVal() override;
ValPtr SizeVal() const override;
@ -637,6 +584,8 @@ public:
std::string ToStdString() const;
StringVal* ToUpper();
const String* UnderlyingVal() const { return string_val; }
unsigned int MemoryAllocation() const override;
StringValPtr Replace(RE_Matcher* re, const String& repl,
@ -649,6 +598,43 @@ public:
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
String* string_val;
};
class FuncVal final : public Val {
public:
explicit FuncVal(FuncPtr f);
FuncPtr AsFuncPtr() const;
ValPtr SizeVal() const override;
Func* UnderlyingVal() const { return func_val.get(); }
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
FuncPtr func_val;
};
class FileVal final : public Val {
public:
explicit FileVal(FilePtr f);
ValPtr SizeVal() const override;
File* UnderlyingVal() const { return file_val.get(); }
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
FilePtr file_val;
};
class PatternVal final : public Val {
@ -660,11 +646,19 @@ public:
void SetMatcher(RE_Matcher* re);
bool MatchExactly(const String* s) const;
bool MatchAnywhere(const String* s) const;
const RE_Matcher* UnderlyingVal() const { return re_val; }
unsigned int MemoryAllocation() const override;
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
RE_Matcher* re_val;
};
// ListVals are mainly used to index tables that have more than one
@ -754,7 +748,7 @@ protected:
ValPtr val;
// The next entry stores seconds since Bro's start. We use ints here
// The next entry stores seconds since Zeek's start. We use ints here
// to save a few bytes, as we do not need a high resolution for these
// anyway.
int expire_access_time;
@ -997,6 +991,9 @@ public:
const detail::AttributesPtr& GetAttrs() const
{ return attrs; }
const PDict<TableEntryVal>* UnderlyingVal() const
{ return table_val; }
// Returns the size of the table.
int Size() const;
int RecursiveSize() const;
@ -1104,6 +1101,9 @@ protected:
// Sends data on to backing Broker Store
void SendToStore(const Val* index, const TableEntryVal* new_entry_val, OnChangeType tpe);
// Low-level insertion, not publicly available.
void Insert(detail::HashKey* k, TableEntryVal* tev);
ValPtr DoClone(CloneState* state) override;
TableTypePtr table_type;
@ -1122,6 +1122,9 @@ protected:
static TableRecordDependencies parse_time_table_record_dependencies;
static ParseTimeTableStates parse_time_table_states;
private:
PDict<TableEntryVal>* table_val;
};
class RecordVal final : public Val, public notifier::detail::Modifiable {
@ -1158,9 +1161,29 @@ public:
void Assign(int field, std::nullptr_t)
{ Assign(field, ValPtr{}); }
[[deprecated("Remove in v4.1. Use GetField().")]]
Val* Lookup(int field) const // Does not Ref() value.
{ return (*AsRecord())[field].get(); }
/**
* Appends a value to the record's fields. The caller is responsible
* for ensuring that fields are appended in the correct orer and
* with the correct type.
* @param v The value to append.
*/
void AppendField(ValPtr v)
{ record_val->emplace_back(std::move(v)); }
/**
* Ensures that the record has enough internal storage for the
* given number of fields.
* @param n The number of fields.
*/
void Reserve(unsigned int n)
{ record_val->reserve(n); }
/**
* Returns the number of fields in the record.
* @return The number of fields in the record.
*/
unsigned int NumFields()
{ return record_val->size(); }
/**
* Returns the value of a given field index.
@ -1168,7 +1191,7 @@ public:
* @return The value at the given field index.
*/
const ValPtr& GetField(int field) const
{ return (*AsRecord())[field]; }
{ return (*record_val)[field]; }
/**
* Returns the value of a given field index as cast to type @c T.
@ -1233,6 +1256,27 @@ public:
IntrusivePtr<T> GetFieldOrDefault(const char* field) const
{ return cast_intrusive<T>(GetField(field)); }
// The following return the given field converted to a particular
// underlying value. We provide these to enable efficient
// access to record fields (without requiring an intermediary Val)
// if we change the underlying representation of records.
#define GET_FIELD_AS(ctype, name ) \
ctype Get ## name ## Field(int field) const \
{ return GetField(field)->As ## name(); } \
ctype Get ## name ## Field(const char* field) const \
{ return GetField(field)->As ## name(); }
GET_FIELD_AS(bool, Bool)
GET_FIELD_AS(int, Enum)
GET_FIELD_AS(bro_int_t, Int)
GET_FIELD_AS(bro_uint_t, Count)
GET_FIELD_AS(double, Double)
GET_FIELD_AS(double, Time)
GET_FIELD_AS(double, Interval)
GET_FIELD_AS(const PortVal*, PortVal)
GET_FIELD_AS(const IPAddr&, Addr)
GET_FIELD_AS(const String*, String)
/**
* Looks up the value of a field by field name. If the field doesn't
* exist in the record type, it's an internal error: abort.
@ -1293,12 +1337,17 @@ protected:
using RecordTypeValMap = std::unordered_map<RecordType*, std::vector<RecordValPtr>>;
static RecordTypeValMap parse_time_records;
private:
std::vector<ValPtr>* record_val;
};
class EnumVal final : public Val {
class EnumVal final : public IntVal {
public:
ValPtr SizeVal() const override;
int UnderlyingVal() const { return int_val; }
protected:
friend class Val;
friend class EnumType;
@ -1306,7 +1355,7 @@ protected:
template<class T, class... Ts>
friend IntrusivePtr<T> make_intrusive(Ts&&... args);
EnumVal(EnumTypePtr t, bro_int_t i) : Val(i, std::move(t))
EnumVal(EnumTypePtr t, bro_int_t i) : IntVal(i, std::move(t))
{}
void ValDescribe(ODesc* d) const override;
@ -1374,6 +1423,16 @@ public:
*/
const ValPtr& At(unsigned int index) const;
/**
* Returns the given element treated as a Count type, to efficiently
* support a common type of vector access if we change the underlying
* vector representation.
* @param index The position in the vector of the element to return.
* @return The element's value, as a Count underlying representation.
*/
bro_uint_t CountAt(unsigned int index) const
{ return At(index)->AsCount(); }
[[deprecated("Remove in v4.1. Use At().")]]
Val* Lookup(unsigned int index) const
{ return At(index).get(); }
@ -1385,7 +1444,7 @@ public:
return At(static_cast<unsigned int>(i)).get();
}
unsigned int Size() const { return val.vector_val->size(); }
unsigned int Size() const { return vector_val->size(); }
// Is there any way to reclaim previously-allocated memory when you
// shrink a vector? The return value is the old size.
@ -1394,6 +1453,9 @@ public:
// Won't shrink size.
unsigned int ResizeAtLeast(unsigned int new_num_elements);
// Reserves storage for at least the number of elements.
void Reserve(unsigned int num_elements);
notifier::detail::Modifiable* Modifiable() override { return this; }
/**
@ -1413,11 +1475,43 @@ public:
// Removes an element at a specific position.
bool Remove(unsigned int index);
/**
* Sorts the vector in place, using the given comparison function.
* @param cmp_func Comparison function for vector elements.
*/
void Sort(bool cmp_func(const ValPtr& a, const ValPtr& b));
const std::vector<ValPtr>* UnderlyingVal() const
{ return vector_val; }
protected:
void ValDescribe(ODesc* d) const override;
ValPtr DoClone(CloneState* state) override;
private:
std::vector<ValPtr>* vector_val;
};
#define UNDERLYING_ACCESSOR_DEF(ztype, ctype, name) \
inline ctype Val::name() const \
{ return dynamic_cast<const ztype*>(this)->UnderlyingVal(); }
UNDERLYING_ACCESSOR_DEF(IntVal, bro_int_t, AsInt)
UNDERLYING_ACCESSOR_DEF(BoolVal, bool, AsBool)
UNDERLYING_ACCESSOR_DEF(EnumVal, int, AsEnum)
UNDERLYING_ACCESSOR_DEF(CountVal, bro_uint_t, AsCount)
UNDERLYING_ACCESSOR_DEF(DoubleVal, double, AsDouble)
UNDERLYING_ACCESSOR_DEF(TimeVal, double, AsTime)
UNDERLYING_ACCESSOR_DEF(IntervalVal, double, AsInterval)
UNDERLYING_ACCESSOR_DEF(SubNetVal, const IPPrefix&, AsSubNet)
UNDERLYING_ACCESSOR_DEF(AddrVal, const IPAddr&, AsAddr)
UNDERLYING_ACCESSOR_DEF(StringVal, const String*, AsString)
UNDERLYING_ACCESSOR_DEF(FuncVal, Func*, AsFunc)
UNDERLYING_ACCESSOR_DEF(FileVal, File*, AsFile)
UNDERLYING_ACCESSOR_DEF(PatternVal, const RE_Matcher*, AsPattern)
UNDERLYING_ACCESSOR_DEF(TableVal, const PDict<TableEntryVal>*, AsTable)
// Checks the given value for consistency with the given type. If an
// exact match, returns it. If promotable, returns the promoted version.
// If not a match, generates an error message and return nil. If is_init is

7
src/Var.cc
View file

@ -322,7 +322,7 @@ static void make_var(const IDPtr& id, TypePtr t, InitClass c, ExprPtr init,
// defined.
std::vector<IDPtr> inits;
auto f = make_intrusive<ScriptFunc>(id, nullptr, inits, 0, 0);
id->SetVal(make_intrusive<Val>(std::move(f)));
id->SetVal(make_intrusive<FuncVal>(std::move(f)));
}
}
@ -750,11 +750,12 @@ void end_func(StmtPtr body)
ingredients->frame_size,
ingredients->priority);
ingredients->id->SetVal(make_intrusive<Val>(std::move(f)));
ingredients->id->SetVal(make_intrusive<FuncVal>(std::move(f)));
ingredients->id->SetConst();
}
auto func = cast_intrusive<ScriptFunc>(ingredients->id->GetVal()->AsFuncPtr());
auto func_ptr = cast_intrusive<FuncVal>(ingredients->id->GetVal())->AsFuncPtr();
auto func = cast_intrusive<ScriptFunc>(func_ptr);
func->SetScope(ingredients->scope);
analyze_func(std::move(func));

2
src/analyzer/protocol/krb/krb-analyzer.pac
View file

@ -263,7 +263,7 @@ refine connection KRB_Conn += {
rv->Assign(1, zeek::val_mgr->Bool(${msg.ap_options.mutual_required}));
auto rvticket = proc_ticket(${msg.ticket});
auto authenticationinfo = zeek_analyzer()->GetAuthenticationInfo(rvticket->GetField(2)->AsString(), rvticket->GetField(4)->AsString(), rvticket->GetField(3)->AsCount());
auto authenticationinfo = zeek_analyzer()->GetAuthenticationInfo(rvticket->GetStringField(2), rvticket->GetStringField(4), rvticket->GetCountField(3));
if ( authenticationinfo )
rvticket->Assign(5, authenticationinfo);

2
src/analyzer/protocol/rpc/NFS.cc
View file

@ -176,7 +176,7 @@ bool NFS_Interp::RPC_BuildReply(RPC_CallInfo* c, BifEnum::rpc_status rpc_status,
case BifEnum::NFS3::PROC_READ:
bro_uint_t offset;
offset = c->RequestVal()->AsRecordVal()->GetField(1)->AsCount();
offset = c->RequestVal()->AsRecordVal()->GetCountField(1);
reply = nfs3_read_reply(buf, n, nfs_status, offset);
event = nfs_proc_read;
break;

4
src/analyzer/protocol/tcp/functions.bif
View file

@ -127,7 +127,7 @@ function get_contents_file%(cid: conn_id, direction: count%): file
auto cf = c->GetRootAnalyzer()->GetContentsFile(direction);
if ( cf )
return zeek::make_intrusive<zeek::Val>(std::move(cf));
return zeek::make_intrusive<zeek::FileVal>(std::move(cf));
}
// Return some sort of error value.
@ -136,5 +136,5 @@ function get_contents_file%(cid: conn_id, direction: count%): file
else
zeek::emit_builtin_error("no contents file for given direction");
return zeek::make_intrusive<zeek::Val>(zeek::make_intrusive<zeek::File>(stderr, "-", "w"));
return zeek::make_intrusive<zeek::FileVal>(zeek::make_intrusive<zeek::File>(stderr, "-", "w"));
%}

2
src/broker/Data.cc
View file

@ -127,7 +127,7 @@ struct val_converter {
auto file = File::Get(a.data());
if ( file )
return make_intrusive<Val>(std::move(file));
return make_intrusive<FileVal>(std::move(file));
return nullptr;
}

2
src/broker/Manager.cc
View file

@ -436,7 +436,7 @@ bool Manager::PublishEvent(string topic, RecordVal* args)
if ( ! args->GetField(0) )
return false;
auto event_name = args->GetField(0)->AsString()->CheckString();
auto event_name = args->GetStringField(0)->CheckString();
auto vv = args->GetField(1)->AsVectorVal();
broker::vector xs;
xs.reserve(vv->Size());

2
src/broker/Store.cc
View file

@ -69,7 +69,7 @@ broker::backend_options to_backend_options(broker::backend backend,
case broker::backend::sqlite:
{
auto path = options->GetField(0)->AsRecordVal()
->GetField(0)->AsStringVal()->CheckString();
->GetStringField(0)->CheckString();
return {{"path", path}};
}

2
src/file_analysis/File.cc
View file

@ -120,7 +120,7 @@ void File::UpdateLastActivityTime()
double File::GetLastActivityTime() const
{
return val->GetField(last_active_idx)->AsTime();
return val->GetTimeField(last_active_idx);
}
bool File::UpdateConnectionFields(Connection* conn, bool is_orig)

4
src/iosource/pcap/pcap.bif
View file

@ -44,7 +44,7 @@ function precompile_pcap_filter%(id: PcapFilterID, s: string%): bool
bool success = true;
zeek::iosource::PktSrc* ps = zeek::iosource_mgr->GetPktSrc();
if ( ps && ! ps->PrecompileFilter(id->ForceAsInt(), s->CheckString()) )
if ( ps && ! ps->PrecompileFilter(id->AsInt(), s->CheckString()) )
success = false;
return zeek::val_mgr->Bool(success);
@ -73,7 +73,7 @@ function Pcap::install_pcap_filter%(id: PcapFilterID%): bool
bool success = true;
zeek::iosource::PktSrc* ps = zeek::iosource_mgr->GetPktSrc();
if ( ps && ! ps->SetFilter(id->ForceAsInt()) )
if ( ps && ! ps->SetFilter(id->AsInt()) )
success = false;
return zeek::val_mgr->Bool(success);

4
src/logging/Manager.cc
View file

@ -1534,7 +1534,7 @@ std::string Manager::FormatRotationPath(EnumValPtr writer,
ri->Assign<TimeVal>(2, open);
ri->Assign<TimeVal>(3, close);
ri->Assign(4, val_mgr->Bool(terminating));
ri->Assign<Val>(5, std::move(postprocessor));
ri->Assign<FuncVal>(5, std::move(postprocessor));
std::string rval;
@ -1543,7 +1543,7 @@ std::string Manager::FormatRotationPath(EnumValPtr writer,
auto res = rotation_format_func->Invoke(ri);
auto rp_val = res->AsRecordVal();
auto dir_val = rp_val->GetFieldOrDefault(0);
auto prefix = rp_val->GetField(1)->AsString()->CheckString();
auto prefix = rp_val->GetStringField(1)->CheckString();
auto dir = dir_val->AsString()->CheckString();
if ( ! util::streq(dir, "") && ! util::detail::ensure_intermediate_dirs(dir) )

3
src/option.bif
View file

@ -209,6 +209,7 @@ function Option::set_change_handler%(ID: string, on_change: any, priority: int &
return zeek::val_mgr->False();
}
i->AddOptionHandler(on_change->AsFuncPtr(), -priority);
auto func = dynamic_cast<FuncVal*>(on_change)->AsFuncPtr();
i->AddOptionHandler(func, -priority);
return zeek::val_mgr->True();
%}

2
src/reporter.bif
View file

@ -148,7 +148,7 @@ function Reporter::conn_weird%(name: string, c: connection, addl: string &defaul
## Returns: true if the file was still valid, else false.
function Reporter::file_weird%(name: string, f: fa_file, addl: string &default="", source: string&default=""%): bool
%{
auto fuid = f->AsRecordVal()->GetField(0)->AsStringVal();
auto fuid = f->AsRecordVal()->GetStringField(0);
auto file = zeek::file_mgr->LookupFile(fuid->CheckString());
if ( ! file )

22
src/strings.bif
View file

@ -684,8 +684,8 @@ function string_to_ascii_hex%(s: string%): string
function str_smith_waterman%(s1: string, s2: string, params: sw_params%) : sw_substring_vec
%{
zeek::detail::SWParams sw_params(
params->AsRecordVal()->GetField(0)->AsCount(),
zeek::detail::SWVariant(params->AsRecordVal()->GetField(1)->AsCount()));
params->AsRecordVal()->GetCountField(0),
zeek::detail::SWVariant(params->AsRecordVal()->GetCountField(1)));
auto* subseq = zeek::detail::smith_waterman(s1->AsString(), s2->AsString(), sw_params);
auto result = zeek::VectorValPtr{zeek::AdoptRef{}, zeek::detail::Substring::VecToPolicy(subseq)};
@ -707,12 +707,13 @@ function str_smith_waterman%(s1: string, s2: string, params: sw_params%) : sw_su
## .. zeek:see:: split_string split_string1 split_string_all split_string_n
function str_split%(s: string, idx: index_vec%): string_vec &deprecated="Remove in v4.1. Use str_split_indices."
%{
auto idx_v = idx->AsVector();
zeek::String::IdxVec indices(idx_v->size());
auto idx_v = dynamic_cast<VectorVal*>(idx);
auto n = idx_v->Size();
zeek::String::IdxVec indices(n);
unsigned int i;
for ( i = 0; i < idx_v->size(); i++ )
indices[i] = (*idx_v)[i]->AsCount();
for ( i = 0; i < n; i++ )
indices[i] = idx_v->CountAt(i);
zeek::String::Vec* result = s->AsString()->Split(indices);
auto result_v = zeek::make_intrusive<zeek::VectorVal>(zeek::id::string_vec);
@ -745,12 +746,13 @@ function str_split%(s: string, idx: index_vec%): string_vec &deprecated="Remove
## .. zeek:see:: split_string split_string1 split_string_all split_string_n
function str_split_indices%(s: string, idx: index_vec%): string_vec
%{
auto idx_v = idx->AsVector();
zeek::String::IdxVec indices(idx_v->size());
auto idx_v = dynamic_cast<VectorVal*>(idx);
auto n = idx_v->Size();
zeek::String::IdxVec indices(n);
unsigned int i;
for ( i = 0; i < idx_v->size(); i++ )
indices[i] = (*idx_v)[i]->AsCount();
for ( i = 0; i < n; i++ )
indices[i] = idx_v->CountAt(i);
zeek::String::Vec* result = s->AsString()->Split(indices);
auto result_v = zeek::make_intrusive<zeek::VectorVal>(zeek::id::string_vec);

8
src/supervisor/Supervisor.cc
View file

@ -1225,7 +1225,7 @@ static BifEnum::Supervisor::ClusterRole role_str_to_enum(std::string_view r)
Supervisor::NodeConfig Supervisor::NodeConfig::FromRecord(const RecordVal* node)
{
Supervisor::NodeConfig rval;
rval.name = node->GetField("name")->AsString()->CheckString();
rval.name = node->GetStringField("name")->CheckString();
const auto& iface_val = node->GetField("interface");
if ( iface_val )
@ -1273,9 +1273,9 @@ Supervisor::NodeConfig Supervisor::NodeConfig::FromRecord(const RecordVal* node)
auto rv = v->GetVal()->AsRecordVal();
Supervisor::ClusterEndpoint ep;
ep.role = static_cast<BifEnum::Supervisor::ClusterRole>(rv->GetField("role")->AsEnum());
ep.host = rv->GetField("host")->AsAddr().AsString();
ep.port = rv->GetField("p")->AsPortVal()->Port();
ep.role = static_cast<BifEnum::Supervisor::ClusterRole>(rv->GetEnumField("role"));
ep.host = rv->GetAddrField("host").AsString();
ep.port = rv->GetPortValField("p")->Port();
const auto& iface = rv->GetField("interface");

4
src/threading/SerialTypes.h
View file

@ -111,8 +111,8 @@ struct Value {
struct subnet_t { addr_t prefix; uint8_t length; };
/**
* This union is a subset of BroValUnion, including only the types we
* can log directly. See IsCompatibleType().
* This union is a subset of the "underlying" values in Val subclasses,
* including only the types we can log directly. See IsCompatibleType().
*/
union _val {
bro_int_t int_val;

56
src/zeek.bif
View file

@ -1432,7 +1432,7 @@ function sort%(v: any, ...%) : any
if ( ! comp && ! IsIntegral(elt_type->Tag()) )
zeek::emit_builtin_error("comparison function required for sort() with non-integral types");
auto& vv = *v->AsVector();
auto vv = dynamic_cast<VectorVal*>(v);
if ( comp )
{
@ -1447,14 +1447,14 @@ function sort%(v: any, ...%) : any
sort_function_comp = comp;
sort(vv.begin(), vv.end(), sort_function);
vv->Sort(sort_function);
}
else
{
if ( elt_type->InternalType() == zeek::TYPE_INTERNAL_UNSIGNED )
sort(vv.begin(), vv.end(), unsigned_sort_function);
vv->Sort(unsigned_sort_function);
else
sort(vv.begin(), vv.end(), signed_sort_function);
vv->Sort(signed_sort_function);
}
return rval;
@ -1502,8 +1502,8 @@ function order%(v: any, ...%) : index_vec
if ( ! comp && ! IsIntegral(elt_type->Tag()) )
zeek::emit_builtin_error("comparison function required for order() with non-integral types");
auto& vv = *v->AsVector();
auto n = vv.size();
auto vv = dynamic_cast<VectorVal*>(v);
auto n = vv->Size();
// Set up initial mapping of indices directly to corresponding
// elements.
@ -1513,7 +1513,7 @@ function order%(v: any, ...%) : index_vec
for ( i = 0; i < n; ++i )
{
ind_vv[i] = i;
index_map.emplace_back(&vv[i]);
index_map.emplace_back(&vv->At(i));
}
if ( comp )
@ -2410,15 +2410,17 @@ function addr_to_counts%(a: addr%): index_vec
## .. zeek:see:: addr_to_counts
function counts_to_addr%(v: index_vec%): addr
%{
if ( v->AsVector()->size() == 1 )
auto vv = dynamic_cast<VectorVal*>(v);
if ( vv->Size() == 1 )
{
return zeek::make_intrusive<zeek::AddrVal>(htonl((*v->AsVector())[0]->AsCount()));
return zeek::make_intrusive<zeek::AddrVal>(htonl(vv->CountAt(0)));
}
else if ( v->AsVector()->size() == 4 )
else if ( vv->Size() == 4 )
{
uint32_t bytes[4];
for ( int i = 0; i < 4; ++i )
bytes[i] = htonl((*v->AsVector())[i]->AsCount());
bytes[i] = htonl(vv->CountAt(i));
return zeek::make_intrusive<zeek::AddrVal>(bytes);
}
else
@ -3526,13 +3528,13 @@ function lookup_connection%(cid: conn_id%): connection
%%{
const char* conn_id_string(zeek::Val* c)
{
const auto& id = (*(c->AsRecord()))[0];
auto vl = id->AsRecord();
auto id = dynamic_cast<const zeek::RecordVal*>(c)->GetField(0);
auto id_r = dynamic_cast<const zeek::RecordVal*>(id.get());
const zeek::IPAddr& orig_h = (*vl)[0]->AsAddr();
uint32_t orig_p = (*vl)[1]->AsPortVal()->Port();
const zeek::IPAddr& resp_h = (*vl)[2]->AsAddr();
uint32_t resp_p = (*vl)[3]->AsPortVal()->Port();
const zeek::IPAddr& orig_h = id_r->GetAddrField(0);
uint32_t orig_p = id_r->GetPortValField(1)->Port();
const zeek::IPAddr& resp_h = id_r->GetAddrField(2);
uint32_t resp_p = id_r->GetPortValField(3)->Port();
return zeek::util::fmt("%s/%u -> %s/%u\n", orig_h.AsString().c_str(), orig_p,
resp_h.AsString().c_str(), resp_p);
@ -3652,14 +3654,14 @@ function dump_packet%(pkt: pcap_packet, file_name: string%) : bool
uint32_t caplen, len, link_type;
u_char *data;
auto pkt_vl = pkt->AsRecord();
auto pkt_r = dynamic_cast<RecordVal*>(pkt);
ts.tv_sec = (*pkt_vl)[0]->AsCount();
ts.tv_usec = (*pkt_vl)[1]->AsCount();
caplen = (*pkt_vl)[2]->AsCount();
len = (*pkt_vl)[3]->AsCount();
data = (*pkt_vl)[4]->AsString()->Bytes();
link_type = (*pkt_vl)[5]->AsEnum();
ts.tv_sec = pkt_r->GetCountField(0);
ts.tv_usec = pkt_r->GetCountField(1);
caplen = pkt_r->GetCountField(2);
len = pkt_r->GetCountField(3);
data = pkt_r->GetStringField(4)->Bytes();
link_type = pkt_r->GetEnumField(5);
Packet p(link_type, &ts, caplen, len, data, true);
addl_pkt_dumper->Dump(&p);
@ -4592,9 +4594,9 @@ function open%(f: string%): file
const char* file = f->CheckString();
if ( zeek::util::streq(file, "-") )
return zeek::make_intrusive<zeek::Val>(zeek::make_intrusive<zeek::File>(stdout, "-", "w"));
return zeek::make_intrusive<zeek::FileVal>(zeek::make_intrusive<zeek::File>(stdout, "-", "w"));
else
return zeek::make_intrusive<zeek::Val>(zeek::make_intrusive<zeek::File>(file, "w"));
return zeek::make_intrusive<zeek::FileVal>(zeek::make_intrusive<zeek::File>(file, "w"));
%}
## Opens a file for writing or appending. If a file with the same name already
@ -4609,7 +4611,7 @@ function open%(f: string%): file
## rmdir unlink rename
function open_for_append%(f: string%): file
%{
return zeek::make_intrusive<zeek::Val>(zeek::make_intrusive<zeek::File>(f->CheckString(), "a"));
return zeek::make_intrusive<zeek::FileVal>(zeek::make_intrusive<zeek::File>(f->CheckString(), "a"));
%}
## Closes an open file and flushes any buffered content.