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

plugin/ComponentManager: hold a reference to the EnumType

Browse source 
Use class IntrusivePtr<>.

This reference is necessary because add_type() may discard the
reference and hold only a reference to a clone of our EnumType.
This commit is contained in:
Max Kellermann 2020-02-26 05:40:44 +01:00
parent db4f449382
commit 17a2f1a3ab
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/plugin/ComponentManager.h
View file

@ -4,6 +4,7 @@
#include <list> #include <list>
#include <string> #include <string>
#include "IntrusivePtr.h"
#include "Type.h" #include "Type.h"
#include "Var.h" // for add_type() #include "Var.h" // for add_type()
#include "Val.h" #include "Val.h"
@ -121,7 +122,7 @@ public:
private: private:
string module; /**< Script layer module in which component tags live. */ string module; /**< Script layer module in which component tags live. */
EnumType* tag_enum_type; /**< Enum type of component tags. */ IntrusivePtr<EnumType> tag_enum_type; /**< Enum type of component tags. */
map<string, C*> components_by_name; map<string, C*> components_by_name;
map<T, C*> components_by_tag; map<T, C*> components_by_tag;
map<int, C*> components_by_val; map<int, C*> components_by_val;
@ -129,11 +130,11 @@ private:
template <class T, class C> template <class T, class C>
ComponentManager<T, C>::ComponentManager(const string& arg_module, const string& local_id) ComponentManager<T, C>::ComponentManager(const string& arg_module, const string& local_id)
: module(arg_module) : module(arg_module),
tag_enum_type(make_intrusive<EnumType>(module + "::" + local_id))
{ {
tag_enum_type = new EnumType(module + "::" + local_id);
::ID* id = install_ID(local_id.c_str(), module.c_str(), true, true); ::ID* id = install_ID(local_id.c_str(), module.c_str(), true, true);
add_type(id, tag_enum_type, 0); add_type(id, tag_enum_type.get(), 0);
zeekygen_mgr->Identifier(id); zeekygen_mgr->Identifier(id);
} }
@ -158,7 +159,7 @@ list<C*> ComponentManager<T, C>::GetComponents() const
template <class T, class C> template <class T, class C>
EnumType* ComponentManager<T, C>::GetTagEnumType() const EnumType* ComponentManager<T, C>::GetTagEnumType() const
{ {
return tag_enum_type; return tag_enum_type.get();
} }
template <class T, class C> template <class T, class C>