Improve performance of PadToColumn by eliminating flushes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77397 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Greene 2009-07-28 23:26:34 +00:00
parent a87861e4f8
commit 7aaad71722
2 changed files with 18 additions and 13 deletions

View File

@ -49,13 +49,13 @@ namespace llvm
///
bool DeleteStream;
/// Column - The current output column of the stream. The column
/// scheme is zero-based.
/// ColumnFlushed - The current output column of the data that's
/// been flushed. The column scheme is zero-based.
///
unsigned Column;
unsigned ColumnFlushed;
virtual void write_impl(const char *Ptr, size_t Size) {
ComputeColumn(Ptr, Size);
ComputeColumn(ColumnFlushed);
TheStream->write(Ptr, Size);
}
@ -67,10 +67,10 @@ namespace llvm
return TheStream->tell() - TheStream->GetNumBytesInBuffer();
}
/// ComputeColumn - Examine the current output and figure out
/// which column we end up in after output.
/// ComputeColumn - Examine the current buffer and figure out
/// which column we're in.
///
void ComputeColumn(const char *Ptr, size_t Size);
void ComputeColumn(unsigned &Column);
public:
/// formatted_raw_ostream - Open the specified file for
@ -84,11 +84,11 @@ namespace llvm
/// underneath it.
///
formatted_raw_ostream(raw_ostream &Stream, bool Delete = false)
: raw_ostream(), TheStream(0), DeleteStream(false), Column(0) {
: raw_ostream(), TheStream(0), DeleteStream(false), ColumnFlushed(0) {
setStream(Stream, Delete);
}
explicit formatted_raw_ostream()
: raw_ostream(), TheStream(0), DeleteStream(false), Column(0) {}
: raw_ostream(), TheStream(0), DeleteStream(false), ColumnFlushed(0) {}
~formatted_raw_ostream() {
if (DeleteStream)

View File

@ -19,11 +19,11 @@ using namespace llvm;
/// ComputeColumn - Examine the current output and figure out which
/// column we end up in after output.
///
void formatted_raw_ostream::ComputeColumn(const char *Ptr, size_t Size) {
void formatted_raw_ostream::ComputeColumn(unsigned &Column) {
// Keep track of the current column by scanning the string for
// special characters
for (const char *epos = Ptr + Size; Ptr != epos; ++Ptr) {
for (const char *Ptr = begin(); Ptr != end(); ++Ptr) {
++Column;
if (*Ptr == '\n' || *Ptr == '\r')
Column = 0;
@ -38,8 +38,13 @@ void formatted_raw_ostream::ComputeColumn(const char *Ptr, size_t Size) {
/// \param MinPad - The minimum space to give after the most recent
/// I/O, even if the current column + minpad > newcol.
///
void formatted_raw_ostream::PadToColumn(unsigned NewCol, unsigned MinPad) {
flush();
void formatted_raw_ostream::PadToColumn(unsigned NewCol, unsigned MinPad) {
// Start out from the last flush position.
unsigned Column = ColumnFlushed;
// Now figure out what's in the buffer and add it to the column
// count.
ComputeColumn(Column);
// Output spaces until we reach the desired column.
unsigned num = NewCol - Column;