replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move the resize file feature from mapped_file_region to the only user. 

This removes a duplicated stat on every file that llvm-ar looks at.

llvm-svn: 224138
This commit is contained in:
Rafael Espindola 2014-12-12 18:13:23 +00:00
parent 555a7a6ad2
commit c69f13bfe1
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Support/FileOutputBuffer.cpp
View File

@ -77,6 +77,10 @@ FileOutputBuffer::create(StringRef FilePath, size_t Size,
if (EC)
return EC;
EC = sys::fs::resize_file(FD, Size);
if (EC)
return EC;
auto MappedFile = llvm::make_unique<mapped_file_region>(
FD, mapped_file_region::readwrite, Size, 0, EC);
int Ret = close(FD);

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

@ -414,19 +414,7 @@ std::error_code setLastModificationAndAccessTime(int FD, TimeValue Time) {
std::error_code mapped_file_region::init(int FD, uint64_t Offset,
mapmode Mode) {
// Figure out how large the file is.
struct stat FileInfo;
if (fstat(FD, &FileInfo) == -1)
return std::error_code(errno, std::generic_category());
uint64_t FileSize = FileInfo.st_size;
if (Size == 0)
Size = FileSize;
else if (FileSize < Size) {
// We need to grow the file.
if (ftruncate(FD, Size) == -1)
return std::error_code(errno, std::generic_category());
}
assert(Size != 0);
int flags = (Mode == readwrite) ? MAP_SHARED : MAP_PRIVATE;
int prot = (Mode == readonly) ? PROT_READ : (PROT_READ | PROT_WRITE);

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

@ -654,12 +654,15 @@ TEST_F(FileSystemTest, FileMapping) {
SmallString<64> TempPath;
ASSERT_NO_ERROR(
fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath));
unsigned Size = 4096;
ASSERT_NO_ERROR(fs::resize_file(FileDescriptor, Size));
// Map in temp file and add some content
std::error_code EC;
StringRef Val("hello there");
{
fs::mapped_file_region mfr(FileDescriptor,
fs::mapped_file_region::readwrite, 4096, 0, EC);
fs::mapped_file_region::readwrite, Size, 0, EC);
ASSERT_NO_ERROR(EC);
std::copy(Val.begin(), Val.end(), mfr.data());
// Explicitly add a 0.
@ -671,14 +674,14 @@ TEST_F(FileSystemTest, FileMapping) {
int FD;
EC = fs::openFileForRead(Twine(TempPath), FD);
ASSERT_NO_ERROR(EC);
fs::mapped_file_region mfr(FD, fs::mapped_file_region::readonly, 0, 0, EC);
fs::mapped_file_region mfr(FD, fs::mapped_file_region::readonly, Size, 0, EC);
ASSERT_NO_ERROR(EC);
// Verify content
EXPECT_EQ(StringRef(mfr.const_data()), Val);
// Unmap temp file
fs::mapped_file_region m(FD, fs::mapped_file_region::readonly, 0, 0, EC);
fs::mapped_file_region m(FD, fs::mapped_file_region::readonly, Size, 0, EC);
ASSERT_NO_ERROR(EC);
ASSERT_EQ(close(FD), 0);
}