Skip to content

Protect multi-thread access to TSystem::fHelper. #5126

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
pcanal merged 1 commit into from
Mar 11, 2020
Merged

Protect multi-thread access to TSystem::fHelper. #5126

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
Protect multi-thread access to TSystem::fHelper. 
Fix ROOT-9966.
  • Loading branch information
@pcanal
pcanal committed Mar 10, 2020
commit a0298dfa91a56ed1ec7b6e536f9e92965eb8a69e
44 changes: 26 additions & 18 deletions core/base/src/TSystem.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,31 +737,37 @@ void TSystem::StackTrace()

TSystem *TSystem::FindHelper(const char *path, void *dirptr)
{
if (!fHelpers)
fHelpers = new TOrdCollection;

TPluginHandler *h;
TSystem *helper = nullptr;
if (path) {
if (!GetDirPtr()) {
TUrl url(path, kTRUE);
if (!strcmp(url.GetProtocol(), "file"))
return nullptr;
{
R__READ_LOCKGUARD(ROOT::gCoreMutex);

if (!fHelpers) {
R__WRITE_LOCKGUARD(ROOT::gCoreMutex);
fHelpers = new TOrdCollection;
}
}

// look for existing helpers
TIter next(fHelpers);
while ((helper = (TSystem*) next()))
if (helper->ConsistentWith(path, dirptr))
return helper;
if (path) {
if (!GetDirPtr()) {
TUrl url(path, kTRUE);
if (!strcmp(url.GetProtocol(), "file"))
return nullptr;
}
}

if (!path)
return nullptr;
// look for existing helpers
TIter next(fHelpers);
while ((helper = (TSystem*) next()))
if (helper->ConsistentWith(path, dirptr))
return helper;

if (!path)
return nullptr;
}

// create new helper
TRegexp re("^root.*:"); // also roots, rootk, etc
TString pname = path;
TPluginHandler *h;
if (pname.BeginsWith("xroot:") || pname.Index(re) != kNPOS) {
// (x)rootd daemon ...
if ((h = gROOT->GetPluginManager()->FindHandler("TSystem", path))) {
Expand All @@ -775,8 +781,10 @@ TSystem *TSystem::FindHelper(const char *path, void *dirptr)
helper = (TSystem*) h->ExecPlugin(0);
}

if (helper)
if (helper) {
R__WRITE_LOCKGUARD(ROOT::gCoreMutex);
fHelpers->Add(helper);
}

return helper;
}
Expand Down