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

Reworking plugin interface to not rely on macros.

Browse source 
The Plugin.cc file is now just a standard class, with the interface
changed a bit to make it more easy to write. However, there're still
some conventions that one must follow to make everything work (like
using the right namespace structure).

This commit also includes the option to compile built-in plugins
dynamically instead of statically by adding
SET(BRO_PLUGIN_BUILD_DYNAMIC TRUE) to their CMake config. This hasn't
been tested much yet, and I'm still undecided if it's somethign we
would want to do by default--but we could now if wanted. :)

Also some minor other cleanup of plugin APIs and built infrastructure.

All tested on MacOS only currently.
This commit is contained in:
Robin Sommer 2014-01-18 22:06:30 +01:00
parent 9227a57935
commit ea01a1be30
21 changed files with 273 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/plugin/Manager.cc
View file

@ -83,8 +83,13 @@ void Manager::SearchDynamicPlugins(const std::string& dir)
if ( name.empty() )
reporter->FatalError("empty plugin magic file %s", magic.c_str());
// Record it, so that we can later activate it.
if ( dynamic_plugins.find(name) != dynamic_plugins.end() )
{
DBG_LOG(DBG_PLUGINS, "Found already known plugin %s in %s, ignoring", name.c_str(), dir.c_str());
return;
}
// Record it, so that we can later activate it.
dynamic_plugins.insert(std::make_pair(name, dir));
DBG_LOG(DBG_PLUGINS, "Found plugin %s in %s", name.c_str(), dir.c_str());
@ -124,6 +129,8 @@ void Manager::SearchDynamicPlugins(const std::string& dir)
if ( st.st_mode & S_IFDIR )
SearchDynamicPlugins(path);
}
closedir(d);
}
bool Manager::ActivateDynamicPluginInternal(const std::string& name)
@ -202,6 +209,9 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name)
if ( ! current_plugin )
reporter->FatalError("load plugin library %s did not instantiate a plugin", path);
current_plugin->SetDynamic(true);
current_plugin->DoConfigure();
// We execute the pre-script initialization here; this in
// fact could be *during* script initialization if we got
// triggered via @load-plugin.
@ -267,11 +277,11 @@ static bool plugin_cmp(const Plugin* a, const Plugin* b)
return a->Name() < b->Name();
}
bool Manager::RegisterPlugin(Plugin *plugin)
void Manager::RegisterPlugin(Plugin *plugin)
{
Manager::PluginsInternal()->push_back(plugin);
if ( current_dir.size() && current_sopath.size() )
if ( current_dir.size() && current_sopath.size() )
// A dynamic plugin, record its location.
plugin->SetPluginLocation(current_dir.c_str(), current_sopath.c_str());
@ -279,7 +289,18 @@ bool Manager::RegisterPlugin(Plugin *plugin)
PluginsInternal()->sort(plugin_cmp);
current_plugin = plugin;
return true;
}
void Manager::RegisterBifFile(const char* plugin, bif_init_func c)
{
bif_init_func_map* bifs = BifFilesInternal();
bif_init_func_map::iterator i = bifs->find(plugin);
if ( i == bifs->end() )
i = bifs->insert(std::make_pair(std::string(plugin), new bif_init_func_list())).first;
i->second->push_back(c);
}
void Manager::InitPreScript()
@ -289,6 +310,7 @@ void Manager::InitPreScript()
for ( plugin_list::iterator i = Manager::PluginsInternal()->begin(); i != Manager::PluginsInternal()->end(); i++ )
{
Plugin* plugin = *i;
plugin->DoConfigure();
plugin->InitPreScript();
}
@ -297,8 +319,18 @@ void Manager::InitPreScript()
void Manager::InitBifs()
{
bif_init_func_map* bifs = BifFilesInternal();
for ( plugin_list::iterator i = Manager::PluginsInternal()->begin(); i != Manager::PluginsInternal()->end(); i++ )
(*i)->InitBifs();
{
bif_init_func_map::const_iterator b = bifs->find((*i)->Name());
if ( b != bifs->end() )
{
for ( bif_init_func_list::const_iterator j = b->second->begin(); j != b->second->end(); ++j )
(**j)(*i);
}
}
}
void Manager::InitPostScript()
@ -339,6 +371,16 @@ Manager::plugin_list* Manager::PluginsInternal()
return plugins;
}
Manager::bif_init_func_map* Manager::BifFilesInternal()
{
static bif_init_func_map* bifs = 0;
if ( ! bifs )
bifs = new bif_init_func_map;
return bifs;
}
static bool hook_cmp(std::pair<int, Plugin*> a, std::pair<int, Plugin*> b)
{
if ( a.first == b.first )