OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

Revert "Support: Add mapped_file_region::sync(), equivalent to msync" 

This reverts commit 142f51fc2f.

This shouldn't be committed, it got committed accidentally.
This commit is contained in:
raghavmedicherla 2022-09-08 12:04:12 -04:00
parent a8c647dbe6
commit 5d3cf8267f
4 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Support/FileSystem.h
View File

@ -1337,9 +1337,6 @@ public:
/// behavior. /// behavior.
const char *const_data() const; const char *const_data() const;
/// Write changes to disk and synchronize. Equivalent to POSIX msync.
std::error_code sync() const;
/// \returns The minimum alignment offset must be. /// \returns The minimum alignment offset must be.
static int alignment(); static int alignment();
}; };

8
llvm/lib/Support/Unix/Path.inc
View File

@ -885,14 +885,6 @@ void mapped_file_region::dontNeedImpl() {
#endif #endif
} }
std::error_code mapped_file_region::sync() const {
assert(Mapping && "Mapping failed but used anyway!");
assert(Mode == readwrite && "sync only valid for readwrite regions!");
if (::msync(Mapping, Size, MS_SYNC))
return std::error_code(errno, std::generic_category());
return std::error_code();
}
int mapped_file_region::alignment() { int mapped_file_region::alignment() {
return Process::getPageSizeEstimate(); return Process::getPageSizeEstimate();
} }

10
llvm/lib/Support/Windows/Path.inc
View File

@ -963,16 +963,6 @@ void mapped_file_region::unmapImpl() {
void mapped_file_region::dontNeedImpl() {} void mapped_file_region::dontNeedImpl() {}
std::error_code mapped_file_region::sync() const {
assert(Mapping && "Mapping failed but used anyway!");
assert(Mode == readwrite && "sync only valid for readwrite regions!");
if (!::FlushViewOfFile(Mapping, Size))
return mapWindowsError(GetLastError());
if (!::FlushFileBuffers(FileHandle))
return mapWindowsError(GetLastError());
return std::error_code();
}
int mapped_file_region::alignment() { int mapped_file_region::alignment() {
SYSTEM_INFO SysInfo; SYSTEM_INFO SysInfo;
::GetSystemInfo(&SysInfo); ::GetSystemInfo(&SysInfo);

27
llvm/unittests/Support/Path.cpp
View File

@ -1463,33 +1463,6 @@ TEST_F(FileSystemTest, FileMapping) {
ASSERT_NO_ERROR(fs::remove(TempPath)); ASSERT_NO_ERROR(fs::remove(TempPath));
} }
TEST_F(FileSystemTest, FileMappingSync) {
// Create a temp file.
int FD;
SmallString<64> TempPath;
ASSERT_NO_ERROR(fs::createTemporaryFile("prefix", "temp", FD, TempPath));
StringRef Content("hello there");
ASSERT_NO_ERROR(fs::resize_file_before_mapping_readwrite(FD, Content.size()));
{
// Map in the file and write some content.
std::error_code EC;
fs::mapped_file_region mfr(fs::convertFDToNativeFile(FD),
fs::mapped_file_region::readwrite,
Content.size(), 0, EC);
ASSERT_NO_ERROR(EC);
ASSERT_EQ(close(FD), 0);
std::copy(Content.begin(), Content.end(), mfr.data());
// Synchronize and check the contents before unmapping.
mfr.sync();
auto Buffer = MemoryBuffer::getFile(TempPath);
ASSERT_TRUE((bool)Buffer);
ASSERT_EQ(Content, Buffer->get()->getBuffer());
}
ASSERT_NO_ERROR(fs::remove(TempPath));
}
TEST(Support, NormalizePath) { TEST(Support, NormalizePath) {
// Input, Expected Win, Expected Posix // Input, Expected Win, Expected Posix
using TestTuple = std::tuple<const char *, const char *, const char *>; using TestTuple = std::tuple<const char *, const char *, const char *>;