Skip to content

Cleanup also current file in TChain::GetEntries #19866

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Cleanup also current file in TChain::GetEntries #19866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b90a87
Revert "[treeplayer] prevent nullptr access in Restart (#19817)"
vepadulano Sep 12, 2025
a552678
[tree] Cleanup also current file in TChain::GetEntries
vepadulano Sep 12, 2025
afb31f5
[treeplayer] Add back regression test for #19814
vepadulano Sep 12, 2025
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
1 change: 1 addition & 0 deletions tree/tree/inc/TChain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class TChain : public TTree {
void
ParseTreeFilename(const char *name, TString &filename, TString &treename, TString &query, TString &suffix) const;
Long64_t RefreshFriendAddresses();
TTreeCache *CleanupCurrentFileAndTree();

protected:
void InvalidateCurrentTree();
Expand Down
109 changes: 58 additions & 51 deletions tree/tree/src/TChain.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,62 @@ Long64_t TChain::GetChainEntryNumber(Long64_t entry) const
return entry + fTreeOffset[fTreeNumber];
}

TTreeCache *TChain::CleanupCurrentFileAndTree()
{
// Delete file unless the file owns this chain!
// FIXME: The "unless" case here causes us to leak memory.
TTreeCache *tpf = nullptr;
if (fFile) {
if (!fDirectory->GetList()->FindObject(this)) {
if (fTree) {
// (fFile != 0 && fTree == 0) can happen when
// InvalidateCurrentTree is called (for example from
// AddFriend). Having fTree === 0 is necessary in that
// case because in some cases GetTree is used as a check
// to see if a TTree is already loaded.
// However, this prevent using the following to reuse
// the TTreeCache object.
tpf = fTree->GetReadCache(fFile);
if (tpf) {
tpf->ResetCache();
}

fFile->SetCacheRead(nullptr, fTree);
// If the tree has clones, copy them into the chain
// clone list so we can change their branch addresses
// when necessary.
//
// This is to support the syntax:
//
// TTree* clone = chain->GetTree()->CloneTree(0);
//
// We need to call the invalidate exactly here, since
// we no longer need the value of fTree and it is
// about to be deleted.
InvalidateCurrentTree();
}

if (fCanDeleteRefs) {
fFile->Close("R");
}
delete fFile;
fFile = nullptr;
} else {
// If the tree has clones, copy them into the chain
// clone list so we can change their branch addresses
// when necessary.
//
// This is to support the syntax:
//
// TTree* clone = chain->GetTree()->CloneTree(0);
//
if (fTree)
InvalidateCurrentTree();
}
}
return tpf;
}

////////////////////////////////////////////////////////////////////////////////
/// Return the total number of entries in the chain.
/// In case the number of entries in each tree is not yet known,
Expand All @@ -908,7 +964,7 @@ Long64_t TChain::GetEntries() const
const auto readEntry = fReadEntry;
auto *thisChain = const_cast<TChain *>(this);
thisChain->LoadTree(TTree::kMaxEntries - 1);
thisChain->InvalidateCurrentTree();
thisChain->CleanupCurrentFileAndTree();
if (readEntry >= 0)
thisChain->LoadTree(readEntry);
else
Expand Down Expand Up @@ -1410,56 +1466,7 @@ Long64_t TChain::LoadTree(Long64_t entry)
}

// Delete the current tree and open the new tree.
TTreeCache* tpf = nullptr;
// Delete file unless the file owns this chain!
// FIXME: The "unless" case here causes us to leak memory.
if (fFile) {
if (!fDirectory->GetList()->FindObject(this)) {
if (fTree) {
// (fFile != 0 && fTree == 0) can happen when
// InvalidateCurrentTree is called (for example from
// AddFriend). Having fTree === 0 is necessary in that
// case because in some cases GetTree is used as a check
// to see if a TTree is already loaded.
// However, this prevent using the following to reuse
// the TTreeCache object.
tpf = fTree->GetReadCache(fFile);
if (tpf) {
tpf->ResetCache();
}

fFile->SetCacheRead(nullptr, fTree);
// If the tree has clones, copy them into the chain
// clone list so we can change their branch addresses
// when necessary.
//
// This is to support the syntax:
//
// TTree* clone = chain->GetTree()->CloneTree(0);
//
// We need to call the invalidate exactly here, since
// we no longer need the value of fTree and it is
// about to be deleted.
InvalidateCurrentTree();
}

if (fCanDeleteRefs) {
fFile->Close("R");
}
delete fFile;
fFile = nullptr;
} else {
// If the tree has clones, copy them into the chain
// clone list so we can change their branch addresses
// when necessary.
//
// This is to support the syntax:
//
// TTree* clone = chain->GetTree()->CloneTree(0);
//
if (fTree) InvalidateCurrentTree();
}
}
auto *tpf = CleanupCurrentFileAndTree();

TChainElement* element = (TChainElement*) fFiles->At(treenum);
if (!element) {
Expand Down
11 changes: 3 additions & 8 deletions tree/treeplayer/src/TTreeReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,14 +567,9 @@ void TTreeReader::Restart()
fProxiesSet = false; // we might get more value readers, meaning new proxies.
fEntry = -1;
if (const auto curFile = fTree->GetCurrentFile()) {
if (!fTree->GetTree()) {
fTree->LoadTree(0);
}
if (fTree->GetTree()) {
if (auto tc = fTree->GetTree()->GetReadCache(curFile, true)) {
tc->DropBranch("*", true);
tc->ResetCache();
}
if (auto tc = fTree->GetTree()->GetReadCache(curFile, true)) {
tc->DropBranch("*", true);
tc->ResetCache();
}
}
}
Expand Down
Loading