mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-24 12:19:53 +00:00
Change default TimerGroup singleton to use magic statics
TimerGroup was showing up on a leak in valigrind, and used some pretty complex code to implement a singleton. This patch replaces the implementation with a vastly simpler one. Differential Revision: https://reviews.llvm.org/D28367 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295370 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
ff2120a9ec
commit
24d2821338
@ -72,22 +72,9 @@ std::unique_ptr<raw_fd_ostream> llvm::CreateInfoOutputFile() {
|
||||
return llvm::make_unique<raw_fd_ostream>(2, false); // stderr.
|
||||
}
|
||||
|
||||
|
||||
static TimerGroup *DefaultTimerGroup = nullptr;
|
||||
static TimerGroup *getDefaultTimerGroup() {
|
||||
TimerGroup *tmp = DefaultTimerGroup;
|
||||
sys::MemoryFence();
|
||||
if (tmp) return tmp;
|
||||
|
||||
sys::SmartScopedLock<true> Lock(*TimerLock);
|
||||
tmp = DefaultTimerGroup;
|
||||
if (!tmp) {
|
||||
tmp = new TimerGroup("misc", "Miscellaneous Ungrouped Timers");
|
||||
sys::MemoryFence();
|
||||
DefaultTimerGroup = tmp;
|
||||
}
|
||||
|
||||
return tmp;
|
||||
static TimerGroup DefaultTimerGroup("misc", "Miscellaneous Ungrouped Timers");
|
||||
return &DefaultTimerGroup;
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -309,7 +296,7 @@ void TimerGroup::PrintQueuedTimers(raw_ostream &OS) {
|
||||
// If this is not an collection of ungrouped times, print the total time.
|
||||
// Ungrouped timers don't really make sense to add up. We still print the
|
||||
// TOTAL line to make the percentages make sense.
|
||||
if (this != DefaultTimerGroup)
|
||||
if (this != getDefaultTimerGroup())
|
||||
OS << format(" Total Execution Time: %5.4f seconds (%5.4f wall clock)\n",
|
||||
Total.getProcessTime(), Total.getWallTime());
|
||||
OS << '\n';
|
||||
|
Loading…
Reference in New Issue
Block a user