RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split getOpenFile into getOpenFile and getOpenFileSlice.

Browse Source 
The main observation is that we never need both the filesize and the map size.
When mapping a slice of a file, it doesn't make sense to request a null
terminator and that would be the only case where the filesize would be used.

There are other cleanups that should be done in this area:

* A client should not have to pass the size (even an explicit -1) to say if
  it wants a null terminator or not, so we should probably swap the argument
  order.
* The default should be to not require a null terminator. Very few clients
  require this, but many end up asking for it just because it is the default.

llvm-svn: 186984
This commit is contained in:
Rafael Espindola 2013-07-23 20:25:01 +00:00
parent 8f45894865
commit f3a9f67eee
8 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/Support/MemoryBuffer.h
View File

@ -74,13 +74,17 @@ public:
int64_t FileSize = -1,
bool RequiresNullTerminator = true);
/// getOpenFile - Given an already-open file descriptor, read the file and
/// return a MemoryBuffer.
// Get a MemoryBuffer of part of a file. Since this is in the middle of a
// file, the buffer is not null terminated.
static error_code getOpenFileSlice(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &Result,
uint64_t MapSize, int64_t Offset);
/// Given an already-open file descriptor, read the file and return a
/// MemoryBuffer.
static error_code getOpenFile(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &result,
uint64_t FileSize = -1,
uint64_t MapSize = -1,
int64_t Offset = 0,
OwningPtr<MemoryBuffer> &Result,
uint64_t FileSize,
bool RequiresNullTerminator = true);
/// getMemBuffer - Open the specified memory range as a MemoryBuffer. Note

32
lib/Support/MemoryBuffer.cpp
View File

@ -248,6 +248,11 @@ error_code MemoryBuffer::getFile(StringRef Filename,
RequiresNullTerminator);
}
static error_code getOpenFileImpl(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &Result,
uint64_t FileSize, uint64_t MapSize,
int64_t Offset, bool RequiresNullTerminator);
error_code MemoryBuffer::getFile(const char *Filename,
OwningPtr<MemoryBuffer> &result,
int64_t FileSize,
@ -257,8 +262,8 @@ error_code MemoryBuffer::getFile(const char *Filename,
if (EC)
return EC;
error_code ret = getOpenFile(FD, Filename, result, FileSize, FileSize,
0, RequiresNullTerminator);
error_code ret = getOpenFileImpl(FD, Filename, result, FileSize, FileSize, 0,
RequiresNullTerminator);
close(FD);
return ret;
}
@ -305,11 +310,10 @@ static bool shouldUseMmap(int FD,
return true;
}
error_code MemoryBuffer::getOpenFile(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &result,
uint64_t FileSize, uint64_t MapSize,
int64_t Offset,
bool RequiresNullTerminator) {
static error_code getOpenFileImpl(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &result,
uint64_t FileSize, uint64_t MapSize,
int64_t Offset, bool RequiresNullTerminator) {
static int PageSize = sys::process::get_self()->page_size();
// Default is to map the full file.
@ -386,6 +390,20 @@ error_code MemoryBuffer::getOpenFile(int FD, const char *Filename,
return error_code::success();
}
error_code MemoryBuffer::getOpenFile(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &Result,
uint64_t FileSize,
bool RequiresNullTerminator) {
return getOpenFileImpl(FD, Filename, Result, FileSize, FileSize, 0,
RequiresNullTerminator);
}
error_code MemoryBuffer::getOpenFileSlice(int FD, const char *Filename,
OwningPtr<MemoryBuffer> &Result,
uint64_t MapSize, int64_t Offset) {
return getOpenFileImpl(FD, Filename, Result, -1, MapSize, Offset, false);
}
//===----------------------------------------------------------------------===//
// MemoryBuffer::getSTDIN implementation.
//===----------------------------------------------------------------------===//

5
tools/gold/gold-plugin.cpp
View File

@ -252,9 +252,8 @@ static ld_plugin_status claim_file_hook(const ld_plugin_input_file *file,
if (file->offset) {
offset = file->offset;
}
if (error_code ec =
MemoryBuffer::getOpenFile(file->fd, file->name, buffer, -1,
file->filesize, offset, false)) {
if (error_code ec = MemoryBuffer::getOpenFileSlice(
file->fd, file->name, buffer, file->filesize, offset)) {
(*message)(LDPL_ERROR, ec.message().c_str());
return LDPS_ERR;
}

6
tools/llvm-ar/llvm-ar.cpp
View File

@ -770,9 +770,9 @@ static void performWriteOperation(ArchiveOperation Operation,
failIfError(sys::fs::status(FD, Status), FileName);
OwningPtr<MemoryBuffer> File;
failIfError(
MemoryBuffer::getOpenFile(FD, FileName, File, Status.getSize()),
FileName);
failIfError(MemoryBuffer::getOpenFile(FD, FileName, File,
Status.getSize(), false),
FileName);
StringRef Name = sys::path::filename(FileName);
if (Name.size() < 16)

7
tools/lto/LTOModule.cpp
View File

@ -209,17 +209,16 @@ LTOModule *LTOModule::makeLTOModule(const char *path, std::string &errMsg) {
LTOModule *LTOModule::makeLTOModule(int fd, const char *path,
size_t size, std::string &errMsg) {
return makeLTOModule(fd, path, size, size, 0, errMsg);
return makeLTOModule(fd, path, size, 0, errMsg);
}
LTOModule *LTOModule::makeLTOModule(int fd, const char *path,
size_t file_size,
size_t map_size,
off_t offset,
std::string &errMsg) {
OwningPtr<MemoryBuffer> buffer;
if (error_code ec = MemoryBuffer::getOpenFile(fd, path, buffer, file_size,
map_size, offset, false)) {
if (error_code ec =
MemoryBuffer::getOpenFileSlice(fd, path, buffer, map_size, offset)) {
errMsg = ec.message();
return NULL;
}

1
tools/lto/LTOModule.h
View File

@ -82,7 +82,6 @@ public:
static LTOModule *makeLTOModule(int fd, const char *path,
size_t size, std::string &errMsg);
static LTOModule *makeLTOModule(int fd, const char *path,
size_t file_size,
size_t map_size,
off_t offset,
std::string& errMsg);

3
tools/lto/lto.cpp
View File

@ -78,8 +78,7 @@ lto_module_t lto_module_create_from_fd_at_offset(int fd, const char *path,
size_t file_size,
size_t map_size,
off_t offset) {
return LTOModule::makeLTOModule(fd, path, file_size, map_size,
offset, sLastErrorString);
return LTOModule::makeLTOModule(fd, path, map_size, offset, sLastErrorString);
}
/// lto_module_create_from_memory - Loads an object file from memory. Returns

11
unittests/Support/MemoryBufferTest.cpp
View File

@ -113,13 +113,10 @@ TEST_F(MemoryBufferTest, getOpenFileNoNullTerminator) {
}
OwningBuffer Buf;
error_code EC = MemoryBuffer::getOpenFile(TestFD,
TestPath.c_str(),
Buf,
40000, // Size
-1,
8000, // Offset
false);
error_code EC = MemoryBuffer::getOpenFileSlice(TestFD, TestPath.c_str(), Buf,
40000, // Size
8000 // Offset
);
EXPECT_FALSE(EC);
StringRef BufData = Buf->getBuffer();