Skip to content

Parallel version of Snapshot in TDataFrame using TBufferMerger #562

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
dpiparo merged 3 commits into from
May 10, 2017
Merged

Parallel version of Snapshot in TDataFrame using TBufferMerger #562

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b0048d
Close merged file upon destruction of TBufferMerger
amadio May 10, 2017
49f8aa6
Update TDataFrame::Snapshot() to work in parallel using TBufferMerger
amadio May 10, 2017
77ff196
Fix documentation of TBufferMerger member variable
amadio May 10, 2017
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
Next Next commit
Close merged file upon destruction of TBufferMerger 
Not closing the file breaks code that needs to open the merged output
file immediately afterwards. For example, the TDataFrame::Snapshot()
action.
  • Loading branch information
@amadio
amadio committed May 10, 2017
commit 0b0048d03bcd250b3bb96d6f6634b14da1965976
1 change: 1 addition & 0 deletions io/io/src/TBufferMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ TBufferMerger::~TBufferMerger()
fCV.notify_one();

fMergingThread->join();
fFile->Close();
Copy link
Member

@pcanal pcanal May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should'nt it be SafeDelete(fFile);
i.e. is the object pointed to by fFile re-used after this statement?

Copy link
Member Author

@amadio amadio May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, fFile is owned by the TBufferMerger class, it's a unique_ptr. It gets destroyed with the server. I just noticed, however, that the documentation on the header is wrong, I will update it.

}

std::shared_ptr<TBufferMergerFile> TBufferMerger::GetFile()
Expand Down