mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
Make timers threadsafe again. This isn't quite as nice as I'd hoped (it uses locking rather than atomic arithmetic),
but should work on all the platforms we care about. I might revisit this if a totally awesome way to do it occurs to me. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74002 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
+53
-1
@@ -38,6 +38,8 @@ static std::string &getLibSupportInfoOutputFilename() {
|
||||
return *LibSupportInfoOutputFilename;
|
||||
}
|
||||
|
||||
static ManagedStatic<sys::SmartMutex<true> > TimerLock;
|
||||
|
||||
namespace {
|
||||
static cl::opt<bool>
|
||||
TrackSpace("track-memory", cl::desc("Enable -time-passes memory "
|
||||
@@ -143,6 +145,7 @@ static TimeRecord getTimeRecord(bool Start) {
|
||||
static ManagedStatic<std::vector<Timer*> > ActiveTimers;
|
||||
|
||||
void Timer::startTimer() {
|
||||
sys::SmartScopedLock<true> L(&Lock);
|
||||
Started = true;
|
||||
ActiveTimers->push_back(this);
|
||||
TimeRecord TR = getTimeRecord(true);
|
||||
@@ -154,6 +157,7 @@ void Timer::startTimer() {
|
||||
}
|
||||
|
||||
void Timer::stopTimer() {
|
||||
sys::SmartScopedLock<true> L(&Lock);
|
||||
TimeRecord TR = getTimeRecord(false);
|
||||
Elapsed += TR.Elapsed;
|
||||
UserTime += TR.UserTime;
|
||||
@@ -171,11 +175,27 @@ void Timer::stopTimer() {
|
||||
}
|
||||
|
||||
void Timer::sum(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;
|
||||
|
||||
if (&T < this) {
|
||||
T.Lock.release();
|
||||
Lock.release();
|
||||
} else {
|
||||
Lock.release();
|
||||
T.Lock.release();
|
||||
}
|
||||
}
|
||||
|
||||
/// addPeakMemoryMeasurement - This method should be called whenever memory
|
||||
@@ -186,8 +206,11 @@ void Timer::addPeakMemoryMeasurement() {
|
||||
size_t MemUsed = getMemUsage();
|
||||
|
||||
for (std::vector<Timer*>::iterator I = ActiveTimers->begin(),
|
||||
E = ActiveTimers->end(); I != E; ++I)
|
||||
E = ActiveTimers->end(); I != E; ++I) {
|
||||
(*I)->Lock.acquire();
|
||||
(*I)->PeakMem = std::max((*I)->PeakMem, MemUsed-(*I)->PeakMemBase);
|
||||
(*I)->Lock.release();
|
||||
}
|
||||
}
|
||||
|
||||
//===----------------------------------------------------------------------===//
|
||||
@@ -206,6 +229,7 @@ static ManagedStatic<Name2Timer> NamedTimers;
|
||||
static ManagedStatic<Name2Pair> NamedGroupedTimers;
|
||||
|
||||
static Timer &getNamedRegionTimer(const std::string &Name) {
|
||||
sys::SmartScopedLock<true> L(&*TimerLock);
|
||||
Name2Timer::iterator I = NamedTimers->find(Name);
|
||||
if (I != NamedTimers->end())
|
||||
return I->second;
|
||||
@@ -215,6 +239,7 @@ static Timer &getNamedRegionTimer(const std::string &Name) {
|
||||
|
||||
static Timer &getNamedRegionTimer(const std::string &Name,
|
||||
const std::string &GroupName) {
|
||||
sys::SmartScopedLock<true> L(&*TimerLock);
|
||||
|
||||
Name2Pair::iterator I = NamedGroupedTimers->find(GroupName);
|
||||
if (I == NamedGroupedTimers->end()) {
|
||||
@@ -276,6 +301,14 @@ static void printVal(double Val, double Total, std::ostream &OS) {
|
||||
}
|
||||
|
||||
void Timer::print(const Timer &Total, std::ostream &OS) {
|
||||
if (&Total < this) {
|
||||
Total.Lock.acquire();
|
||||
Lock.acquire();
|
||||
} else {
|
||||
Lock.acquire();
|
||||
Total.Lock.acquire();
|
||||
}
|
||||
|
||||
if (Total.UserTime)
|
||||
printVal(UserTime, Total.UserTime, OS);
|
||||
if (Total.SystemTime)
|
||||
@@ -300,6 +333,14 @@ void Timer::print(const Timer &Total, std::ostream &OS) {
|
||||
OS << Name << "\n";
|
||||
|
||||
Started = false; // Once printed, don't print again
|
||||
|
||||
if (&Total < this) {
|
||||
Total.Lock.release();
|
||||
Lock.release();
|
||||
} else {
|
||||
Lock.release();
|
||||
Total.Lock.release();
|
||||
}
|
||||
}
|
||||
|
||||
// GetLibSupportInfoOutputFile - Return a file stream to print our output on...
|
||||
@@ -324,6 +365,7 @@ llvm::GetLibSupportInfoOutputFile() {
|
||||
|
||||
|
||||
void TimerGroup::removeTimer() {
|
||||
sys::SmartScopedLock<true> L(&*TimerLock);
|
||||
if (--NumTimers == 0 && !TimersToPrint.empty()) { // Print timing report...
|
||||
// Sort the timers in descending order by amount of time taken...
|
||||
std::sort(TimersToPrint.begin(), TimersToPrint.end(),
|
||||
@@ -391,3 +433,13 @@ void TimerGroup::removeTimer() {
|
||||
}
|
||||
}
|
||||
|
||||
void TimerGroup::addTimer() {
|
||||
sys::SmartScopedLock<true> L(&*TimerLock);
|
||||
++NumTimers;
|
||||
}
|
||||
|
||||
void TimerGroup::addTimerToPrint(const Timer &T) {
|
||||
sys::SmartScopedLock<true> L(&*TimerLock);
|
||||
TimersToPrint.push_back(Timer(true, T));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user