Skip to content

Fix #9214: Avoid bogus "NoDefault" plugin load on every attach and unnecessary loadModuleMutex locks #9224

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

Open
mariuz wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −8
Open

Fix #9214: Avoid bogus "NoDefault" plugin load on every attach and unnecessary loadModuleMutex locks #9224

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/remote/remote.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ class ClntAuthBlock final :
{
public:
ClientCrypt()
: pluginItr(Firebird::IPluginManager::TYPE_KEY_HOLDER, "NoDefault"),
: pluginItr(Firebird::IPluginManager::TYPE_KEY_HOLDER, ""),
currentIface(nullptr), afterIface(nullptr),
triedPlugins(getPool())
{ }
Expand Down
24 changes: 17 additions & 7 deletions src/yvalve/PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,16 +905,26 @@ namespace
currentPlugin = NULL;
}

// Avoid concurrent load of the same module
static Static<Mutex> loadModuleMutex;
MutexLockGuard lmGuard(*(&loadModuleMutex), FB_FUNCTION);

MutexLockGuard g(plugins->mutex, FB_FUNCTION);

while (currentName.getWord(namesList, " \t,;"))
{
// First check - may be currentName is present among already configured plugins
ConfiguredPlugin* tmp = NULL;
{
MutexLockGuard g(plugins->mutex, FB_FUNCTION);

// First check - may be currentName is present among already configured plugins
if (plugins->get(MapKey(interfaceType, currentName), tmp))
{
currentPlugin = tmp;
break;
}
}

// Avoid concurrent load of the same module
static Static<Mutex> loadModuleMutex;
MutexLockGuard lmGuard(*(&loadModuleMutex), FB_FUNCTION);

MutexLockGuard g(plugins->mutex, FB_FUNCTION);

if (plugins->get(MapKey(interfaceType, currentName), tmp))
{
currentPlugin = tmp;
Expand Down
Loading