mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
change functions for ZVal type management to static members
This commit is contained in:
Vern Paxson
parent
1e316c05c9
commit
efe40204e0
5 changed files with 58 additions and 59 deletions
|
|
@ -863,7 +863,7 @@ void RecordType::AddField(unsigned int field, const TypeDecl* td)
|
|||
{
|
||||
ASSERT(field == managed_fields.size());
|
||||
|
||||
managed_fields.push_back(IsManagedType(td->type));
|
||||
managed_fields.push_back(ZVal::IsManagedType(td->type));
|
||||
}
|
||||
|
||||
bool RecordType::HasField(const char* field) const
|
||||
|
|
|
|||
26
src/Val.cc
26
src/Val.cc
|
|
@ -2873,7 +2873,7 @@ RecordVal::~RecordVal()
|
|||
|
||||
for ( unsigned int i = 0; i < n; ++i )
|
||||
if ( HasField(i) && IsManaged(i) )
|
||||
DeleteManagedType((*record_val)[i]);
|
||||
ZVal::DeleteManagedType((*record_val)[i]);
|
||||
|
||||
delete record_val;
|
||||
delete is_in_record;
|
||||
|
|
@ -2904,7 +2904,7 @@ void RecordVal::Remove(int field)
|
|||
if ( HasField(field) )
|
||||
{
|
||||
if ( IsManaged(field) )
|
||||
DeleteManagedType((*record_val)[field]);
|
||||
ZVal::DeleteManagedType((*record_val)[field]);
|
||||
|
||||
(*record_val)[field] = ZVal();
|
||||
(*is_in_record)[field] = false;
|
||||
|
|
@ -3199,7 +3199,7 @@ VectorVal::VectorVal(VectorTypePtr t) : Val(t)
|
|||
|
||||
auto y_tag = yield_type->Tag();
|
||||
any_yield = (y_tag == TYPE_VOID || y_tag == TYPE_ANY);
|
||||
managed_yield = IsManagedType(yield_type);
|
||||
managed_yield = ZVal::IsManagedType(yield_type);
|
||||
}
|
||||
|
||||
VectorVal::~VectorVal()
|
||||
|
|
@ -3208,14 +3208,14 @@ VectorVal::~VectorVal()
|
|||
{
|
||||
int n = yield_types->size();
|
||||
for ( auto i = 0; i < n; ++i )
|
||||
DeleteIfManaged((*vector_val)[i], (*yield_types)[i]);
|
||||
ZVal::DeleteIfManaged((*vector_val)[i], (*yield_types)[i]);
|
||||
delete yield_types;
|
||||
}
|
||||
|
||||
else if ( managed_yield )
|
||||
{
|
||||
for ( auto& elem : *vector_val )
|
||||
DeleteManagedType(elem);
|
||||
ZVal::DeleteManagedType(elem);
|
||||
}
|
||||
|
||||
delete vector_val;
|
||||
|
|
@ -3283,13 +3283,13 @@ bool VectorVal::Assign(unsigned int index, ValPtr element)
|
|||
{
|
||||
const auto& t = element->GetType();
|
||||
(*yield_types)[index] = t;
|
||||
DeleteIfManaged((*vector_val)[index], t);
|
||||
ZVal::DeleteIfManaged((*vector_val)[index], t);
|
||||
(*vector_val)[index] = ZVal(std::move(element), t);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( managed_yield )
|
||||
DeleteManagedType((*vector_val)[index]);
|
||||
ZVal::DeleteManagedType((*vector_val)[index]);
|
||||
(*vector_val)[index] = ZVal(std::move(element), yield_type);
|
||||
}
|
||||
|
||||
|
|
@ -3324,11 +3324,11 @@ bool VectorVal::Insert(unsigned int index, ValPtr element)
|
|||
it = std::next(vector_val->begin(), index);
|
||||
if ( yield_types )
|
||||
{
|
||||
DeleteIfManaged(*it, element->GetType());
|
||||
ZVal::DeleteIfManaged(*it, element->GetType());
|
||||
types_it = std::next(yield_types->begin(), index);
|
||||
}
|
||||
else if ( managed_yield )
|
||||
DeleteManagedType(*it);
|
||||
ZVal::DeleteManagedType(*it);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -3371,12 +3371,12 @@ bool VectorVal::Remove(unsigned int index)
|
|||
if ( yield_types )
|
||||
{
|
||||
auto types_it = std::next(yield_types->begin(), index);
|
||||
DeleteIfManaged(*it, *types_it);
|
||||
ZVal::DeleteIfManaged(*it, *types_it);
|
||||
yield_types->erase(types_it);
|
||||
}
|
||||
|
||||
else if ( managed_yield )
|
||||
DeleteManagedType(*it);
|
||||
ZVal::DeleteManagedType(*it);
|
||||
|
||||
vector_val->erase(it);
|
||||
|
||||
|
|
@ -3488,7 +3488,7 @@ void VectorVal::Sort(Func* cmp_func)
|
|||
reporter->RuntimeError(GetLocationInfo(), "cannot sort a vector-of-any");
|
||||
|
||||
sort_type = yield_type;
|
||||
sort_type_is_managed = IsManagedType(sort_type);
|
||||
sort_type_is_managed = ZVal::IsManagedType(sort_type);
|
||||
|
||||
bool (*sort_func)(const ZVal&, const ZVal&);
|
||||
|
||||
|
|
@ -3525,7 +3525,7 @@ VectorValPtr VectorVal::Order(Func* cmp_func)
|
|||
}
|
||||
|
||||
sort_type = yield_type;
|
||||
sort_type_is_managed = IsManagedType(sort_type);
|
||||
sort_type_is_managed = ZVal::IsManagedType(sort_type);
|
||||
|
||||
bool (*sort_func)(size_t, size_t);
|
||||
|
||||
|
|
|
|||
|
|
@ -1112,7 +1112,7 @@ public:
|
|||
|
||||
void Assign(int field, StringVal* new_val)
|
||||
{
|
||||
DeleteManagedType((*record_val)[field]);
|
||||
ZVal::DeleteManagedType((*record_val)[field]);
|
||||
(*record_val)[field].string_val = new_val;
|
||||
AddedField(field);
|
||||
}
|
||||
|
|
@ -1381,7 +1381,7 @@ private:
|
|||
void DeleteFieldIfManaged(unsigned int field)
|
||||
{
|
||||
if ( HasField(field) && IsManaged(field) )
|
||||
DeleteManagedType((*record_val)[field]);
|
||||
ZVal::DeleteManagedType((*record_val)[field]);
|
||||
}
|
||||
|
||||
bool IsManaged(unsigned int offset) const
|
||||
|
|
|
|||
49
src/ZVal.cc
49
src/ZVal.cc
|
|
@ -13,31 +13,6 @@ using namespace zeek;
|
|||
bool ZVal::zval_was_nil = false;
|
||||
|
||||
|
||||
bool zeek::IsManagedType(const TypePtr& t)
|
||||
{
|
||||
switch ( t->Tag() ) {
|
||||
case zeek::TYPE_ADDR:
|
||||
case zeek::TYPE_ANY:
|
||||
case zeek::TYPE_FILE:
|
||||
case zeek::TYPE_FUNC:
|
||||
case zeek::TYPE_LIST:
|
||||
case zeek::TYPE_OPAQUE:
|
||||
case zeek::TYPE_PATTERN:
|
||||
case zeek::TYPE_RECORD:
|
||||
case zeek::TYPE_STRING:
|
||||
case zeek::TYPE_SUBNET:
|
||||
case zeek::TYPE_TABLE:
|
||||
case zeek::TYPE_TYPE:
|
||||
case zeek::TYPE_VECTOR:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ZVal::ZVal(ValPtr v, const TypePtr& t)
|
||||
{
|
||||
if ( ! v )
|
||||
|
|
@ -300,3 +275,27 @@ ValPtr ZVal::ToVal(const TypePtr& t) const
|
|||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool ZVal::IsManagedType(const TypePtr& t)
|
||||
{
|
||||
switch ( t->Tag() ) {
|
||||
case zeek::TYPE_ADDR:
|
||||
case zeek::TYPE_ANY:
|
||||
case zeek::TYPE_FILE:
|
||||
case zeek::TYPE_FUNC:
|
||||
case zeek::TYPE_LIST:
|
||||
case zeek::TYPE_OPAQUE:
|
||||
case zeek::TYPE_PATTERN:
|
||||
case zeek::TYPE_RECORD:
|
||||
case zeek::TYPE_STRING:
|
||||
case zeek::TYPE_SUBNET:
|
||||
case zeek::TYPE_TABLE:
|
||||
case zeek::TYPE_TYPE:
|
||||
case zeek::TYPE_VECTOR:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
36
src/ZVal.h
36
src/ZVal.h
|
|
@ -79,6 +79,24 @@ union ZVal {
|
|||
|
||||
Obj* ManagedVal() const { return managed_val; }
|
||||
|
||||
// True if a given type is one for which we manage the associated
|
||||
// memory internally.
|
||||
static bool IsManagedType(const TypePtr& t);
|
||||
|
||||
// Deletes a managed value. Caller needs to ensure that the ZVal
|
||||
// indeed holds such.
|
||||
static void DeleteManagedType(ZVal& v)
|
||||
{
|
||||
Unref(v.ManagedVal());
|
||||
}
|
||||
|
||||
// Deletes a possibly-managed value.
|
||||
static void DeleteIfManaged(ZVal& v, const TypePtr& t)
|
||||
{
|
||||
if ( IsManagedType(t) )
|
||||
DeleteManagedType(v);
|
||||
}
|
||||
|
||||
private:
|
||||
friend class RecordVal;
|
||||
friend class VectorVal;
|
||||
|
|
@ -124,22 +142,4 @@ private:
|
|||
static bool zval_was_nil;
|
||||
};
|
||||
|
||||
// True if a given type is one for which we manage the associated
|
||||
// memory internally.
|
||||
bool IsManagedType(const TypePtr& t);
|
||||
|
||||
// Deletes a managed value. Caller needs to ensure that the ZVal
|
||||
// indeed holds such.
|
||||
inline void DeleteManagedType(ZVal& v)
|
||||
{
|
||||
Unref(v.ManagedVal());
|
||||
}
|
||||
|
||||
// Deletes a possibly-managed value.
|
||||
inline void DeleteIfManaged(ZVal& v, const TypePtr& t)
|
||||
{
|
||||
if ( IsManagedType(t) )
|
||||
DeleteManagedType(v);
|
||||
}
|
||||
|
||||
} // zeek
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue