Skip to content

[net] TParallelMergingFile: don't rely on nbytes for UploadAndReset() #20211

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 1 commit into
base: master
Choose a base branch
from
+7 −5
Open

[net] TParallelMergingFile: don't rely on nbytes for UploadAndReset() #20211

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
12 changes: 7 additions & 5 deletions net/net/src/TParallelMergingFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@ Bool_t TParallelMergingFile::UploadAndReset()
fMessage.WriteLong64(GetEND());
CopyTo(fMessage);

// FIXME: CXX17: Use init-statement in if to declare `error` variable
int error;
if ((error = fSocket->Send(fMessage)) <= 0) {
if (int error = fSocket->Send(fMessage); error <= 0) {
Error("UploadAndReset","Upload to the merging server failed with %d\n",error);
delete fSocket;
fSocket = 0;
Expand Down Expand Up @@ -177,8 +175,12 @@ Bool_t TParallelMergingFile::UploadAndReset()

Int_t TParallelMergingFile::Write(const char *, Int_t opt, Int_t bufsize)
{
Int_t nbytes = TMemFile::Write(0,opt,bufsize);
if (nbytes) {
std::size_t prevSize = GetBytesWritten();
auto nbytes = TMemFile::Write(0,opt,bufsize);
std::size_t newSize = GetBytesWritten();
// NOTE: we don't rely on nbytes > 0 to do UploadAndReset() because nbytes may be 0 if the file
// only contains non-TObject objects (as they are not written by TMemFile::Write).
if (newSize > prevSize) {
UploadAndReset();
}
return nbytes;
Expand Down
Loading