Skip to content

Avoid race condition in PluginFactoryBase #35388

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

Merged
cmsbuild merged 1 commit into from
Sep 24, 2021
Merged

Avoid race condition in PluginFactoryBase #35388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion FWCore/PluginManager/src/PluginFactoryBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,12 @@ namespace edmplugin {

void PluginFactoryBase::registerPMaker(void* iPMaker, const std::string& iName) {
assert(nullptr != iPMaker);
m_plugins[iName].push_back(PluginMakerInfo(iPMaker, PluginManager::loadingFile()));
PMakers newMakers;
newMakers.emplace_back(iPMaker, PluginManager::loadingFile());
if (not m_plugins.emplace(iName, std::move(newMakers)).second) {
//the item was already added
m_plugins[iName].push_back(PluginMakerInfo(iPMaker, PluginManager::loadingFile()));
}
newPlugin(iName);
}

Expand Down