6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-21 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity

llvm-ar: close input files early.

Browse Source 
We already have them mapped into memory, so we can just close the file.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224020 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-12-11 15:16:14 +00:00
parent 11fb1d0eb5
commit 1fa01645ad
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,8 +413,6 @@ class NewArchiveIterator {
object::Archive::child_iterator OldI;
StringRef NewFilename;
mutable int NewFD;
mutable sys::fs::file_status NewStatus;
public:
NewArchiveIterator(object::Archive::child_iterator I, StringRef Name);
@ -426,7 +424,7 @@ public:
object::Archive::child_iterator getOld() const;
StringRef getNew() const;
int getFD() const;
int getFD(sys::fs::file_status &NewStatus) const;
const sys::fs::file_status &getStatus() const;
};
}
@ -438,7 +436,7 @@ NewArchiveIterator::NewArchiveIterator(object::Archive::child_iterator I,
: IsNewMember(false), Name(Name), OldI(I) {}
NewArchiveIterator::NewArchiveIterator(StringRef NewFilename, StringRef Name)
: IsNewMember(true), Name(Name), NewFilename(NewFilename), NewFD(-1) {}
: IsNewMember(true), Name(Name), NewFilename(NewFilename) {}
StringRef NewArchiveIterator::getName() const { return Name; }
@ -454,10 +452,9 @@ StringRef NewArchiveIterator::getNew() const {
return NewFilename;
}
int NewArchiveIterator::getFD() const {
int NewArchiveIterator::getFD(sys::fs::file_status &NewStatus) const {
assert(IsNewMember);
if (NewFD != -1)
return NewFD;
int NewFD;
failIfError(sys::fs::openFileForRead(NewFilename, NewFD), NewFilename);
assert(NewFD != -1);
@ -472,12 +469,6 @@ int NewArchiveIterator::getFD() const {
return NewFD;
}
const sys::fs::file_status &NewArchiveIterator::getStatus() const {
assert(IsNewMember);
assert(NewFD != -1 && "Must call getFD first");
return NewStatus;
}
template <typename T>
void addMember(std::vector<NewArchiveIterator> &Members, T I, StringRef Name,
int Pos = -1) {
@ -768,6 +759,7 @@ performWriteOperation(ArchiveOperation Operation, object::Archive *OldArchive,
std::vector<std::unique_ptr<MemoryBuffer>> Buffers;
std::vector<MemoryBufferRef> Members;
std::vector<sys::fs::file_status> NewMemberStatus;
for (unsigned I = 0, N = NewMembers.size(); I < N; ++I) {
NewArchiveIterator &Member = NewMembers[I];
@ -775,11 +767,14 @@ performWriteOperation(ArchiveOperation Operation, object::Archive *OldArchive,
if (Member.isNewMember()) {
StringRef Filename = Member.getNew();
int FD = Member.getFD();
const sys::fs::file_status &Status = Member.getStatus();
NewMemberStatus.resize(NewMemberStatus.size() + 1);
sys::fs::file_status &Status = NewMemberStatus.back();
int FD = Member.getFD(Status);
ErrorOr<std::unique_ptr<MemoryBuffer>> MemberBufferOrErr =
MemoryBuffer::getOpenFile(FD, Filename, Status.getSize(), false);
failIfError(MemberBufferOrErr.getError(), Filename);
if (close(FD) != 0)
fail("Could not close file");
Buffers.push_back(std::move(MemberBufferOrErr.get()));
MemberRef = Buffers.back()->getMemBufferRef();
} else {
@ -804,6 +799,7 @@ performWriteOperation(ArchiveOperation Operation, object::Archive *OldArchive,
unsigned MemberNum = 0;
unsigned LongNameMemberNum = 0;
unsigned NewMemberNum = 0;
for (std::vector<NewArchiveIterator>::iterator I = NewMembers.begin(),
E = NewMembers.end();
I != E; ++I, ++MemberNum) {
@ -820,7 +816,8 @@ performWriteOperation(ArchiveOperation Operation, object::Archive *OldArchive,
MemoryBufferRef File = Members[MemberNum];
if (I->isNewMember()) {
StringRef FileName = I->getNew();
const sys::fs::file_status &Status = I->getStatus();
const sys::fs::file_status &Status = NewMemberStatus[NewMemberNum];
NewMemberNum++;
StringRef Name = sys::path::filename(FileName);
if (Name.size() < 16)