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

Retry loading plugins on failure to resolve to dependencies.

Browse source 
Closes #1179.
This commit is contained in:
Robin Sommer 2020-11-24 17:00:41 +00:00
parent b780bc146f
commit fe45f5335a
3 changed files with 79 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/plugin/Manager.cc
View file

@ -140,7 +140,7 @@ void Manager::SearchDynamicPlugins(const std::string& dir)
closedir(d);
}
bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_not_found)
bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_not_found, std::vector<std::string>* errors)
{
dynamic_plugin_map::iterator m = dynamic_plugins.find(util::strtolower(name));
@ -160,7 +160,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
return true;
}
reporter->Error("plugin %s is not available", name.c_str());
errors->push_back(util::fmt("plugin %s is not available", name.c_str()));
return false;
}
@ -192,16 +192,19 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
current_plugin = nullptr;
current_dir = dir.c_str();
current_sopath = path;
void* hdl = dlopen(path, RTLD_LAZY | RTLD_GLOBAL);
void* hdl = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
if ( ! hdl )
{
const char* err = dlerror();
reporter->FatalError("cannot load plugin library %s: %s", path, err ? err : "<unknown error>");
errors->push_back(util::fmt("cannot load plugin library %s: %s", path, err ? err : "<unknown error>"));
return false;
}
if ( ! current_plugin )
reporter->FatalError("load plugin library %s did not instantiate a plugin", path);
if ( ! current_plugin ) {
errors->push_back(util::fmt("load plugin library %s did not instantiate a plugin", path));
return false;
}
current_plugin->SetDynamic(true);
current_plugin->DoConfigure();
@ -217,9 +220,11 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
// Make sure the name the plugin reports is consistent with
// what we expect from its magic file.
if ( util::strtolower(current_plugin->Name()) != util::strtolower(name) )
reporter->FatalError("inconsistent plugin name: %s vs %s",
current_plugin->Name().c_str(), name.c_str());
if ( util::strtolower(current_plugin->Name()) != util::strtolower(name) ) {
errors->push_back(util::fmt("inconsistent plugin name: %s vs %s",
current_plugin->Name().c_str(), name.c_str()));
return false;
}
current_dir = nullptr;
current_sopath = nullptr;
@ -294,37 +299,66 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
return true;
}
bool Manager::ActivateDynamicPlugin(const std::string& name)
void Manager::ActivateDynamicPlugin(const std::string& name)
{
if ( ! ActivateDynamicPluginInternal(name) )
return false;
UpdateInputFiles();
return true;
std::vector<std::string> errors;
if ( ActivateDynamicPluginInternal(name, false, &errors) )
UpdateInputFiles();
else
// Reschedule for another attempt later.
requested_plugins.insert(std::move(name));
}
bool Manager::ActivateDynamicPlugins(bool all)
{
void Manager::ActivateDynamicPlugins(bool all) {
// Tracks plugins we need to activate as pairs of their names and booleans
// indicating whether an activation failure is to be deemed a fatal error.
std::set<std::pair<std::string, bool>> plugins_to_activate;
// Activate plugins that were specifically requested.
for ( const auto& x : requested_plugins )
plugins_to_activate.emplace(x, false);
// Activate plugins that our environment tells us to.
vector<string> p;
util::tokenize_string(util::zeek_plugin_activate(), ",", &p);
for ( size_t n = 0; n < p.size(); ++n )
ActivateDynamicPluginInternal(p[n], true);
for ( const auto& x : p )
plugins_to_activate.emplace(x, true);
if ( all )
{
for ( dynamic_plugin_map::const_iterator i = dynamic_plugins.begin();
i != dynamic_plugins.end(); i++ )
// Activate all other ones we discovered.
for ( const auto& x : dynamic_plugins )
plugins_to_activate.emplace(x.first, false);
}
// Now we keep iterating over all the plugins, trying to load them, for as
// long as we're successful for at least one further of them each round.
// Doing so ensures that we can resolve (non-cyclic) load dependencies
// independent of any particular order.
while ( ! plugins_to_activate.empty() ) {
std::vector<std::string> errors;
auto plugins_left = plugins_to_activate;
for ( const auto& x : plugins_to_activate )
{
if ( ! ActivateDynamicPluginInternal(i->first) )
return false;
if ( ActivateDynamicPluginInternal(x.first, x.second, &errors) )
plugins_left.erase(x);
}
if ( plugins_left.size() == plugins_to_activate.size() )
{
// Could not load a single further plugin this round, that's fatal.
for ( const auto& msg : errors )
reporter->Error("%s", msg.c_str());
reporter->FatalError("aborting after plugin errors");
}
plugins_to_activate = std::move(plugins_left);
}
UpdateInputFiles();
return true;
}
void Manager::UpdateInputFiles()