From 0ea86bc411748f10b913f42ef3a71b46ace7ceb2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 29 Mar 2010 21:24:52 +0000 Subject: [PATCH] various timer fixes: move operator= out of line, eliminate the per-timer lock (timers should be externally locked if needed), the info-output-stream can never be dbgs(), so drop the check. Make some stuff private. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99839 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Timer.h | 41 ++++++------------------------------ lib/Support/Timer.cpp | 33 +++++++++++++++++------------ 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/include/llvm/Support/Timer.h b/include/llvm/Support/Timer.h index 8a0f55d9b93..f05ede60cb3 100644 --- a/include/llvm/Support/Timer.h +++ b/include/llvm/Support/Timer.h @@ -40,54 +40,27 @@ class Timer { double SystemTime; // System time elapsed ssize_t MemUsed; // Memory allocated (in bytes) size_t PeakMem; // Peak memory used - size_t PeakMemBase; // Temporary for peak calculation... - std::string Name; // The name of this time variable + size_t PeakMemBase; // Temporary for peak memory calculation. + std::string Name; // The name of this time variable. bool Started; // Has this time variable ever been started? TimerGroup *TG; // The TimerGroup this Timer is in. - mutable sys::SmartMutex Lock; // Mutex for the contents of this Timer. public: explicit Timer(const std::string &N); Timer(const std::string &N, TimerGroup &tg); Timer(const Timer &T); ~Timer(); +private: double getProcessTime() const { return UserTime+SystemTime; } double getWallTime() const { return Elapsed; } ssize_t getMemUsed() const { return MemUsed; } size_t getPeakMem() const { return PeakMem; } +public: std::string getName() const { return Name; } - const Timer &operator=(const Timer &T) { - if (&T < this) { - T.Lock.acquire(); - Lock.acquire(); - } else { - Lock.acquire(); - T.Lock.acquire(); - } - - Elapsed = T.Elapsed; - UserTime = T.UserTime; - SystemTime = T.SystemTime; - MemUsed = T.MemUsed; - PeakMem = T.PeakMem; - PeakMemBase = T.PeakMemBase; - Name = T.Name; - Started = T.Started; - assert(TG == T.TG && "Can only assign timers in the same TimerGroup!"); - - if (&T < this) { - T.Lock.release(); - Lock.release(); - } else { - Lock.release(); - T.Lock.release(); - } - - return *this; - } - - // operator< - Allow sorting... + const Timer &operator=(const Timer &T); + + // operator< - Allow sorting. bool operator<(const Timer &T) const { // Sort by Wall Time elapsed, as it is the only thing really accurate return Elapsed < T.Elapsed; diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 4dbb34c8a94..16ab55fcbce 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -147,7 +147,6 @@ static TimeRecord getTimeRecord(bool Start) { static ManagedStatic > ActiveTimers; void Timer::startTimer() { - sys::SmartScopedLock L(*TimerLock); Started = true; ActiveTimers->push_back(this); TimeRecord TR = getTimeRecord(true); @@ -159,7 +158,6 @@ void Timer::startTimer() { } void Timer::stopTimer() { - sys::SmartScopedLock L(*TimerLock); TimeRecord TR = getTimeRecord(false); Elapsed += TR.Elapsed; UserTime += TR.UserTime; @@ -184,14 +182,26 @@ void Timer::sum(const Timer &T) { PeakMem += T.PeakMem; } +const Timer &Timer::operator=(const Timer &T) { + Elapsed = T.Elapsed; + UserTime = T.UserTime; + SystemTime = T.SystemTime; + MemUsed = T.MemUsed; + PeakMem = T.PeakMem; + PeakMemBase = T.PeakMemBase; + Name = T.Name; + Started = T.Started; + assert(TG == T.TG && "Can only assign timers in the same TimerGroup!"); + return *this; +} + + /// addPeakMemoryMeasurement - This method should be called whenever memory /// usage needs to be checked. It adds a peak memory measurement to the /// currently active timers, which will be printed when the timer group prints /// void Timer::addPeakMemoryMeasurement() { - sys::SmartScopedLock L(*TimerLock); size_t MemUsed = getMemUsage(); - for (std::vector::iterator I = ActiveTimers->begin(), E = ActiveTimers->end(); I != E; ++I) (*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase); @@ -208,7 +218,6 @@ static void printVal(double Val, double Total, raw_ostream &OS) { } void Timer::print(const Timer &Total, raw_ostream &OS) { - sys::SmartScopedLock L(*TimerLock); if (Total.UserTime) printVal(UserTime, Total.UserTime, OS); if (Total.SystemTime) @@ -219,13 +228,13 @@ void Timer::print(const Timer &Total, raw_ostream &OS) { OS << " "; - if (Total.MemUsed) { + if (Total.MemUsed) OS << format("%9lld", (long long)MemUsed) << " "; - } + if (Total.PeakMem) { - if (PeakMem) { + if (PeakMem) OS << format("%9lld", (long long)PeakMem) << " "; - } else + else OS << " "; } OS << Name << "\n"; @@ -286,15 +295,13 @@ NamedRegionTimer::NamedRegionTimer(const std::string &Name, //===----------------------------------------------------------------------===// // GetLibSupportInfoOutputFile - Return a file stream to print our output on. -raw_ostream * -llvm::GetLibSupportInfoOutputFile() { +raw_ostream *llvm::GetLibSupportInfoOutputFile() { std::string &LibSupportInfoOutputFilename = getLibSupportInfoOutputFilename(); if (LibSupportInfoOutputFilename.empty()) return &errs(); if (LibSupportInfoOutputFilename == "-") return &outs(); - std::string Error; raw_ostream *Result = new raw_fd_ostream(LibSupportInfoOutputFilename.c_str(), Error, raw_fd_ostream::F_Append); @@ -373,7 +380,7 @@ void TimerGroup::removeTimer() { TimersToPrint.clear(); - if (OutStream != &errs() && OutStream != &outs() && OutStream != &dbgs()) + if (OutStream != &errs() && OutStream != &outs()) delete OutStream; // Close the file. } -- 2.34.1