[llvm] r335293 - [dsymutil] Force mmap'ing of binaries

Jonas Devlieghere via llvm-commits llvm-commits at lists.llvm.org
Thu Jun 21 14:37:53 PDT 2018


Author: jdevlieghere
Date: Thu Jun 21 14:37:53 2018
New Revision: 335293

URL: http://llvm.org/viewvc/llvm-project?rev=335293&view=rev
Log:
[dsymutil] Force mmap'ing of binaries

After the recent refactoring that introduced parallel handling of
different object, the binary holder became unique per object file. This
defeats its optimization of caching archives, leading to an archive
being opened for every binary it contains. This is obviously unfortunate
and will need to be refactored soon.

Luckily in practice, the impact of this is limited as most files are
mmap'ed instead of memcopy'd. There's a caveat however: when the memory
buffer requires a null terminator and it's a multiple of the page size,
we allocate instead of mmap'ing. If this happens for a static archive,
we end up with N copies of it in memory, where N is the number of
objects in the archive, leading to exuberant memory usage. This provided
a stopgap solution to ensure that all the files it loads are mmap in
memory by removing the requirement for a terminating null byte.

Differential revision: https://reviews.llvm.org/D48397

Modified:
    llvm/trunk/tools/dsymutil/BinaryHolder.cpp

Modified: llvm/trunk/tools/dsymutil/BinaryHolder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/BinaryHolder.cpp?rev=335293&r1=335292&r2=335293&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/BinaryHolder.cpp (original)
+++ llvm/trunk/tools/dsymutil/BinaryHolder.cpp Thu Jun 21 14:37:53 2018
@@ -62,7 +62,7 @@ ErrorOr<std::vector<MemoryBufferRef>> Bi
   // (either because the archive is not there anymore, or because the
   // archive doesn't contain the requested member), this will still
   // provide a sensible error message.
-  auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(Filename);
+  auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(Filename, -1, false);
   if (auto Err = ErrOrFile.getError())
     return Err;
 
@@ -136,7 +136,7 @@ BinaryHolder::MapArchiveAndGetMemberBuff
     StringRef Filename, sys::TimePoint<std::chrono::seconds> Timestamp) {
   StringRef ArchiveFilename = Filename.substr(0, Filename.find('('));
 
-  auto ErrOrBuff = MemoryBuffer::getFileOrSTDIN(ArchiveFilename);
+  auto ErrOrBuff = MemoryBuffer::getFileOrSTDIN(ArchiveFilename, -1, false);
   if (auto Err = ErrOrBuff.getError())
     return Err;
 




More information about the llvm-commits mailing list