Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Sofa.Helper] PluginManager: check if a plugin is already loaded with a different path #2352

Merged
merged 3 commits into from
Sep 29, 2021
Merged

[Sofa.Helper] PluginManager: check if a plugin is already loaded with a different path #2352

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59a2893
add a check if plugin has already been loaded with a different path
fredroy Sep 21, 2021
4211ad0
Update SofaKernel/modules/SofaHelper/src/sofa/helper/system/PluginMan…
fredroy Sep 23, 2021
bc19fe6
fix compil
fredroy Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion SofaKernel/modules/SofaHelper/src/sofa/helper/system/PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,18 @@ Plugin* PluginManager::getPlugin(const std::string& plugin, const std::string& /
}
else
{
// check if a plugin with a same name but a different path is loaded
// problematic case per se but at least we can warn the user
const auto& pluginName = sofa::helper::system::SetDirectory::GetFileNameWithoutExtension(pluginPath.c_str());
for (auto& k : m_pluginMap)
{
if (pluginName == k.second.getModuleName())
{
msg_warning("PluginManager") << "Plugin " << pluginName << " is already loaded from a different path, check you configuration.";
return &k.second;
}
}

msg_info("PluginManager") << "Plugin not found in loaded plugins: " << plugin;
return nullptr;
}
Expand Down Expand Up @@ -417,11 +429,26 @@ bool PluginManager::pluginIsLoaded(const std::string& plugin)
if (!FileSystem::isFile(plugin))
{
// path is invalid
msg_error("PluginManager") << "File not found: " << plugin;
msg_error("PluginManager") << "Could not check if the plugin is loaded as the path is invalid: " << plugin;
return false;
}

pluginPath = plugin;

// argument is a path but we need to check if it was not already loaded with a different path
const auto& pluginName = sofa::helper::system::SetDirectory::GetFileNameWithoutExtension(pluginPath.c_str());
for (const auto& k : m_pluginMap)
{
if (pluginName == k.second.getModuleName() && pluginPath != k.first)
fredroy marked this conversation as resolved.
Show resolved Hide resolved
{
// we did find a plugin with the same, but it does not have the same path...
msg_warning("PluginManager") << "This plugin " << pluginName << " has been loaded from a different path, it will certainly lead to bugs or crashes... " << msgendl
<< "You tried to load: " << pluginPath << msgendl
<< "Already loaded: " << k.first;
return true;
}
}

}
else
{
Expand Down