Add a SmartScopedLock, and use it to simplify code.

llvm-svn: 73722
This commit is contained in:
Owen Anderson 2009-06-18 20:51:00 +00:00
parent a6dc7456e1
commit 5a6960fcc3
2 changed files with 20 additions and 5 deletions

View File

@ -115,6 +115,22 @@ namespace llvm
/// Mutex - A standard, always enforced mutex.
typedef SmartMutex<false> Mutex;
template<bool mt_only>
class SmartScopedLock {
SmartMutex<mt_only>* mtx;
public:
SmartScopedLock(SmartMutex<mt_only>* m) : mtx(m) {
mtx->acquire();
}
~SmartScopedLock() {
mtx->release();
}
};
typedef SmartScopedLock<false> ScopedLock;
}
}

View File

@ -358,7 +358,7 @@ namespace {
/// -time-passes is enabled on the command line.
///
static ManagedStatic<sys::Mutex> TimingInfoMutex;
static ManagedStatic<sys::SmartMutex<true> > TimingInfoMutex;
class VISIBILITY_HIDDEN TimingInfo {
std::map<Pass*, Timer> TimingData;
@ -384,22 +384,21 @@ public:
if (dynamic_cast<PMDataManager *>(P))
return;
if (llvm_is_multithreaded()) TimingInfoMutex->acquire();
sys::SmartScopedLock<true> Lock(&*TimingInfoMutex);
std::map<Pass*, Timer>::iterator I = TimingData.find(P);
if (I == TimingData.end())
I=TimingData.insert(std::make_pair(P, Timer(P->getPassName(), TG))).first;
I->second.startTimer();
if (llvm_is_multithreaded()) TimingInfoMutex->release();
}
void passEnded(Pass *P) {
if (dynamic_cast<PMDataManager *>(P))
return;
if (llvm_is_multithreaded()) TimingInfoMutex->acquire();
sys::SmartScopedLock<true> Lock(&*TimingInfoMutex);
std::map<Pass*, Timer>::iterator I = TimingData.find(P);
assert(I != TimingData.end() && "passStarted/passEnded not nested right!");
I->second.stopTimer();
if (llvm_is_multithreaded()) TimingInfoMutex->release();
}
};