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

Merge remote-tracking branch 'origin/topic/awelzel/revert-type-manager-intro'

Browse source 
* origin/topic/awelzel/revert-type-manager-intro:
  Revert "Type: Add TypeManager->TypeList() and use for ListVal()"
This commit is contained in:
Arne Welzel 2023-04-14 10:32:17 +02:00
commit 5db2e5fd8e
6 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CHANGES
View file

@ -1,3 +1,12 @@
6.0.0-dev.367 | 2023-04-14 10:32:17 +0200
* Revert "Type: Add TypeManager->TypeList() and use for ListVal()" (Arne Welzel, Corelight)
This reverts commit 24c606b4df92f9871964c5bcb2fe90e43a177b1f.
This commit introduced a memory leak due to ListVal::Append() modifying
the cached TYPE_ANY type list.
6.0.0-dev.364 | 2023-04-13 15:54:00 -0700
* Add NEWS entry for the CMake changes (Dominik Charousset, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.364
6.0.0-dev.367

16
src/Type.cc
View file

@ -1981,22 +1981,6 @@ detail::TraversalCode VectorType::Traverse(detail::TraversalCallback* cb) const
HANDLE_TC_TYPE_POST(tc);
}
TypeManager::TypeManager()
{
for ( auto i = 0u; i < base_list_types.size(); ++i )
{
TypeTag tag = static_cast<TypeTag>(i);
TypePtr pure_type = tag == TYPE_ANY ? nullptr : base_type(tag);
base_list_types[tag] = make_intrusive<zeek::TypeList>(pure_type);
}
}
const TypeListPtr& TypeManager::TypeList(TypeTag t) const
{
assert(t >= 0 && t < NUM_TYPES);
return base_list_types[t];
}
// Returns true if t1 is initialization-compatible with t2 (i.e., if an
// initializer with type t1 can be used to initialize a value with type t2),
// false otherwise. Assumes that t1's tag is different from t2's. Note

16
src/Type.h
View file

@ -2,7 +2,6 @@
#pragma once
#include <array>
#include <list>
#include <map>
#include <optional>
@ -867,21 +866,6 @@ protected:
TypePtr yield_type;
};
// Holds pre-allocated Type objects.
class TypeManager
{
public:
TypeManager();
// Get a Typelist instance with the given type tag.
const TypeListPtr& TypeList(TypeTag t) const;
private:
std::array<TypeListPtr, NUM_TYPES> base_list_types;
};
extern TypeManager* type_mgr;
// True if the two types are equivalent. If is_init is true then the test is
// done in the context of an initialization. If match_record_field_names is
// true then for record types the field names have to match, too.

5
src/Val.cc
View file

@ -1188,7 +1188,10 @@ ValPtr PatternVal::DoClone(CloneState* state)
return state->NewClone(this, make_intrusive<PatternVal>(re));
}
ListVal::ListVal(TypeTag t) : Val(type_mgr->TypeList(t)), tag(t) { }
ListVal::ListVal(TypeTag t) : Val(make_intrusive<TypeList>(t == TYPE_ANY ? nullptr : base_type(t)))
{
tag = t;
}
ListVal::~ListVal() { }

3
src/zeek-setup.cc
View file

@ -172,7 +172,6 @@ void do_ssl_deinit()
} // namespace
#endif
zeek::TypeManager* zeek::type_mgr = nullptr;
zeek::ValManager* zeek::val_mgr = nullptr;
zeek::packet_analysis::Manager* zeek::packet_mgr = nullptr;
zeek::analyzer::Manager* zeek::analyzer_mgr = nullptr;
@ -438,7 +437,6 @@ static void terminate_zeek()
delete session_mgr;
delete fragment_mgr;
delete telemetry_mgr;
delete type_mgr;
// free the global scope
pop_scope();
@ -595,7 +593,6 @@ SetupResult setup(int argc, char** argv, Options* zopts)
run_state::zeek_start_time = util::current_time(true);
type_mgr = new TypeManager();
val_mgr = new ValManager();
reporter = new Reporter(options.abort_on_scripting_errors);
thread_mgr = new threading::Manager();