maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix filesystem race issue in SampleProfTest introduced in rL342283. 

Before this fix, multiple invocations of testRoundTrip will create multiple
writers which share the same file as output destination. That could introduce
filesystem race issue when multiple subtests are executed concurrently. This
patch assign writers with different files as their output destinations.

llvm-svn: 342301
This commit is contained in:
Wei Mi 2018-09-15 00:04:15 +00:00
parent 01d250eed9
commit 67f57c6795
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/unittests/ProfileData/SampleProfTest.cpp
View File

@ -37,24 +37,21 @@ namespace {
struct SampleProfTest : ::testing::Test {
LLVMContext Context;
std::string Profile;
std::unique_ptr<raw_ostream> OS;
std::unique_ptr<SampleProfileWriter> Writer;
std::unique_ptr<SampleProfileReader> Reader;
std::error_code EC;
SampleProfTest()
: Profile("profile"),
OS(new raw_fd_ostream(Profile, EC, sys::fs::F_None)), Writer(),
Reader() {}
SampleProfTest() : Writer(), Reader() {}
void createWriter(SampleProfileFormat Format) {
void createWriter(SampleProfileFormat Format, const std::string &Profile) {
std::error_code EC;
std::unique_ptr<raw_ostream> OS(
new raw_fd_ostream(Profile, EC, sys::fs::F_None));
auto WriterOrErr = SampleProfileWriter::create(OS, Format);
ASSERT_TRUE(NoError(WriterOrErr.getError()));
Writer = std::move(WriterOrErr.get());
}
void readProfile(const Module &M) {
void readProfile(const Module &M, const std::string &Profile) {
auto ReaderOrErr = SampleProfileReader::create(Profile, Context);
ASSERT_TRUE(NoError(ReaderOrErr.getError()));
Reader = std::move(ReaderOrErr.get());
@ -62,7 +59,8 @@ struct SampleProfTest : ::testing::Test {
}
void testRoundTrip(SampleProfileFormat Format) {
createWriter(Format);
std::string Profile = std::string("profile.") + std::to_string(Format);
createWriter(Format, Profile);
StringRef FooName("_Z3fooi");
FunctionSamples FooSamples;
@ -103,7 +101,7 @@ struct SampleProfTest : ::testing::Test {
Writer->getOutputStream().flush();
readProfile(M);
readProfile(M, Profile);
EC = Reader->read();
ASSERT_TRUE(NoError(EC));