RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-27 14:45:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support/Unix: use ScopedLock wherever possible

Browse Source 
Only one function remains a bit too complicated
for a simple mutex guard. No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216335 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dylan Noblesmith 2014-08-23 22:49:17 +00:00
parent a2a6fa2fd5
commit 7e3e4311c5
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Support/Unix/Signals.inc
View File

@ -196,37 +196,37 @@ static RETSIGTYPE SignalHandler(int Sig) {
}
void llvm::sys::RunInterruptHandlers() {
SignalsMutex.acquire();
sys::SmartScopedLock<true> Guard(SignalsMutex);
RemoveFilesToRemove();
SignalsMutex.release();
}
void llvm::sys::SetInterruptFunction(void (*IF)()) {
SignalsMutex.acquire();
InterruptFunction = IF;
SignalsMutex.release();
{
sys::SmartScopedLock<true> Guard(SignalsMutex);
InterruptFunction = IF;
}
RegisterHandlers();
}
// RemoveFileOnSignal - The public API
bool llvm::sys::RemoveFileOnSignal(StringRef Filename,
std::string* ErrMsg) {
SignalsMutex.acquire();
std::string *OldPtr = FilesToRemove.empty() ? nullptr : &FilesToRemove[0];
FilesToRemove.push_back(Filename);
{
sys::SmartScopedLock<true> Guard(SignalsMutex);
std::string *OldPtr = FilesToRemove.empty() ? nullptr : &FilesToRemove[0];
FilesToRemove.push_back(Filename);
// We want to call 'c_str()' on every std::string in this vector so that if
// the underlying implementation requires a re-allocation, it happens here
// rather than inside of the signal handler. If we see the vector grow, we
// have to call it on every entry. If it remains in place, we only need to
// call it on the latest one.
if (OldPtr == &FilesToRemove[0])
FilesToRemove.back().c_str();
else
for (unsigned i = 0, e = FilesToRemove.size(); i != e; ++i)
FilesToRemove[i].c_str();
SignalsMutex.release();
// We want to call 'c_str()' on every std::string in this vector so that if
// the underlying implementation requires a re-allocation, it happens here
// rather than inside of the signal handler. If we see the vector grow, we
// have to call it on every entry. If it remains in place, we only need to
// call it on the latest one.
if (OldPtr == &FilesToRemove[0])
FilesToRemove.back().c_str();
else
for (unsigned i = 0, e = FilesToRemove.size(); i != e; ++i)
FilesToRemove[i].c_str();
}
RegisterHandlers();
return false;
@ -234,7 +234,7 @@ bool llvm::sys::RemoveFileOnSignal(StringRef Filename,
// DontRemoveFileOnSignal - The public API
void llvm::sys::DontRemoveFileOnSignal(StringRef Filename) {
SignalsMutex.acquire();
sys::SmartScopedLock<true> Guard(SignalsMutex);
std::vector<std::string>::reverse_iterator RI =
std::find(FilesToRemove.rbegin(), FilesToRemove.rend(), Filename);
std::vector<std::string>::iterator I = FilesToRemove.end();
@ -247,8 +247,6 @@ void llvm::sys::DontRemoveFileOnSignal(StringRef Filename) {
// made on insertion become invalid by being copied down an element.
for (std::vector<std::string>::iterator E = FilesToRemove.end(); I != E; ++I)
I->c_str();
SignalsMutex.release();
}
/// AddSignalHandler - Add a function to be called when a signal is delivered