From: Benjamin Kramer Date: Fri, 25 Jun 2010 16:07:18 +0000 (+0000) Subject: Rewrite MemoryBuffer::getSTDIN to use read(2) and a SmallVector buffer. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=831338b320d9059b59564aa82f0703c3aff8c74f;p=oota-llvm.git Rewrite MemoryBuffer::getSTDIN to use read(2) and a SmallVector buffer. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106856 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index 22e12e9d344..542162d513b 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -272,26 +272,26 @@ MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr, //===----------------------------------------------------------------------===// MemoryBuffer *MemoryBuffer::getSTDIN(std::string *ErrStr) { - char Buffer[4096*4]; - - std::vector FileData; - // Read in all of the data from stdin, we cannot mmap stdin. // // FIXME: That isn't necessarily true, we should try to mmap stdin and // fallback if it fails. sys::Program::ChangeStdinToBinary(); - size_t ReadBytes; - do { - ReadBytes = fread(Buffer, sizeof(char), sizeof(Buffer), stdin); - FileData.insert(FileData.end(), Buffer, Buffer+ReadBytes); - } while (ReadBytes == sizeof(Buffer)); - if (!feof(stdin)) { - if (ErrStr) *ErrStr = "error reading from stdin"; - return 0; - } + const ssize_t ChunkSize = 4096*4; + SmallString Buffer; + ssize_t ReadBytes; + // Read into Buffer until we hit EOF. + do { + Buffer.reserve(Buffer.size() + ChunkSize); + ReadBytes = read(0, Buffer.end(), ChunkSize); + if (ReadBytes == -1) { + if (errno == EINTR) continue; + if (ErrStr) *ErrStr = sys::StrError(); + return 0; + } + Buffer.set_size(Buffer.size() + ReadBytes); + } while (ReadBytes != 0); - FileData.push_back(0); // &FileData[Size] is invalid. So is &*FileData.end(). - return getMemBufferCopy(StringRef(&FileData[0],FileData.size()-1), ""); + return getMemBufferCopy(Buffer, ""); }