zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: collated: threaded writing accesses out-of-scope. Fixes #2257.

Browse Source
This commit is contained in:
Mattijs Janssens
2021-11-02 14:26:30 +00:00
committed by Mark Olesen
parent 08e66a64e1
commit 227b3976ba
15 changed files with 70 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenFOAM/global/fileOperations/collatedFileOperation/OFstreamCollator.C
View File

@ -52,7 +52,7 @@ bool Foam::OFstreamCollator::writeFile
const PtrList<SubList<char>>& slaveData, // optional slave data
IOstreamOption streamOpt,
const bool append,
const dictionary* headerEntriesPtr
const dictionary& headerEntries
)
{
if (debug)
@ -96,7 +96,7 @@ bool Foam::OFstreamCollator::writeFile
"", // note
"", // location (leave empty instead inaccurate)
fName.name(), // object name
headerEntriesPtr
headerEntries
);
}
}
@ -350,7 +350,7 @@ bool Foam::OFstreamCollator::write
IOstreamOption streamOpt,
const bool append,
const bool useThread,
const dictionary* headerEntriesPtr
const dictionary& headerEntries
)
{
// Determine (on master) sizes to receive. Note: do NOT use thread
@ -389,7 +389,7 @@ bool Foam::OFstreamCollator::write
dummySlaveData,
streamOpt,
append,
headerEntriesPtr
headerEntries
);
}
else if (totalSize <= maxBufferSize_)
@ -427,7 +427,7 @@ bool Foam::OFstreamCollator::write
recvSizes,
streamOpt,
append,
headerEntriesPtr
headerEntries
)
);
writeData& fileAndData = fileAndDataPtr();
@ -552,7 +552,7 @@ bool Foam::OFstreamCollator::write
recvSizes,
streamOpt,
append,
headerEntriesPtr
headerEntries
)
);