maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Cleaning up remaining static initializers in Signals.inc 

llvm-svn: 216996
This commit is contained in:
Chris Bieneman 2014-09-02 23:48:13 +00:00
parent 3f0e834842
commit 186e7d1700
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
llvm/lib/Support/Unix/Signals.inc
View File

@ -16,6 +16,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/Mutex.h"
#include "llvm/Support/UniqueLock.h"
#include "llvm/Support/ManagedStatic.h"
#include <algorithm>
#include <string>
#include <vector>
@ -42,13 +43,14 @@ using namespace llvm;
static RETSIGTYPE SignalHandler(int Sig); // defined below.
static SmartMutex<true> SignalsMutex;
static ManagedStatic<SmartMutex<true> > SignalsMutex;
/// InterruptFunction - The function to call if ctrl-c is pressed.
static void (*InterruptFunction)() = nullptr;
static std::vector<std::string> FilesToRemove;
static std::vector<std::pair<void(*)(void*), void*> > CallBacksToRun;
static ManagedStatic<std::vector<std::string>> FilesToRemove;
static ManagedStatic<std::vector<std::pair<void (*)(void *), void *>>>
CallBacksToRun;
// IntSigs - Signals that represent requested termination. There's no bug
// or failure, or if there is, it's not our direct responsibility. For whatever
@ -124,11 +126,12 @@ static void UnregisterHandlers() {
static void RemoveFilesToRemove() {
// We avoid iterators in case of debug iterators that allocate or release
// memory.
for (unsigned i = 0, e = FilesToRemove.size(); i != e; ++i) {
std::vector<std::string>& FilesToRemoveRef = *FilesToRemove;
for (unsigned i = 0, e = FilesToRemoveRef.size(); i != e; ++i) {
// We rely on a std::string implementation for which repeated calls to
// 'c_str()' don't allocate memory. We pre-call 'c_str()' on all of these
// strings to try to ensure this is safe.
const char *path = FilesToRemove[i].c_str();
const char *path = FilesToRemoveRef[i].c_str();
// Get the status so we can determine if it's a file or directory. If we
// can't stat the file, ignore it.
@ -162,7 +165,7 @@ static RETSIGTYPE SignalHandler(int Sig) {
sigprocmask(SIG_UNBLOCK, &SigMask, nullptr);
{
unique_lock<SmartMutex<true>> Guard(SignalsMutex);
unique_lock<SmartMutex<true>> Guard(*SignalsMutex);
RemoveFilesToRemove();
if (std::find(std::begin(IntSigs), std::end(IntSigs), Sig)
@ -182,8 +185,10 @@ static RETSIGTYPE SignalHandler(int Sig) {
}
// Otherwise if it is a fault (like SEGV) run any handler.
for (unsigned i = 0, e = CallBacksToRun.size(); i != e; ++i)
CallBacksToRun[i].first(CallBacksToRun[i].second);
std::vector<std::pair<void (*)(void *), void *>>& CallBacksToRunRef =
*CallBacksToRun;
for (unsigned i = 0, e = CallBacksToRun->size(); i != e; ++i)
CallBacksToRunRef[i].first(CallBacksToRunRef[i].second);
#ifdef __s390__
// On S/390, certain signals are delivered with PSW Address pointing to
@ -196,13 +201,13 @@ static RETSIGTYPE SignalHandler(int Sig) {
}
void llvm::sys::RunInterruptHandlers() {
sys::SmartScopedLock<true> Guard(SignalsMutex);
sys::SmartScopedLock<true> Guard(*SignalsMutex);
RemoveFilesToRemove();
}
void llvm::sys::SetInterruptFunction(void (*IF)()) {
{
sys::SmartScopedLock<true> Guard(SignalsMutex);
sys::SmartScopedLock<true> Guard(*SignalsMutex);
InterruptFunction = IF;
}
RegisterHandlers();
@ -212,20 +217,22 @@ void llvm::sys::SetInterruptFunction(void (*IF)()) {
bool llvm::sys::RemoveFileOnSignal(StringRef Filename,
std::string* ErrMsg) {
{
sys::SmartScopedLock<true> Guard(SignalsMutex);
std::string *OldPtr = FilesToRemove.empty() ? nullptr : &FilesToRemove[0];
FilesToRemove.push_back(Filename);
sys::SmartScopedLock<true> Guard(*SignalsMutex);
std::vector<std::string>& FilesToRemoveRef = *FilesToRemove;
std::string *OldPtr =
FilesToRemoveRef.empty() ? nullptr : &FilesToRemoveRef[0];
FilesToRemoveRef.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();
if (OldPtr == &FilesToRemoveRef[0])
FilesToRemoveRef.back().c_str();
else
for (unsigned i = 0, e = FilesToRemove.size(); i != e; ++i)
FilesToRemove[i].c_str();
for (unsigned i = 0, e = FilesToRemoveRef.size(); i != e; ++i)
FilesToRemoveRef[i].c_str();
}
RegisterHandlers();
@ -234,18 +241,18 @@ bool llvm::sys::RemoveFileOnSignal(StringRef Filename,
// DontRemoveFileOnSignal - The public API
void llvm::sys::DontRemoveFileOnSignal(StringRef Filename) {
sys::SmartScopedLock<true> Guard(SignalsMutex);
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();
if (RI != FilesToRemove.rend())
I = FilesToRemove.erase(RI.base()-1);
std::find(FilesToRemove->rbegin(), FilesToRemove->rend(), Filename);
std::vector<std::string>::iterator I = FilesToRemove->end();
if (RI != FilesToRemove->rend())
I = FilesToRemove->erase(RI.base()-1);
// We need to call c_str() on every element which would have been moved by
// the erase. These elements, in a C++98 implementation where c_str()
// requires a reallocation on the first call may have had the call to c_str()
// made on insertion become invalid by being copied down an element.
for (std::vector<std::string>::iterator E = FilesToRemove.end(); I != E; ++I)
for (std::vector<std::string>::iterator E = FilesToRemove->end(); I != E; ++I)
I->c_str();
}
@ -253,7 +260,7 @@ void llvm::sys::DontRemoveFileOnSignal(StringRef Filename) {
/// to the process. The handler can have a cookie passed to it to identify
/// what instance of the handler it is.
void llvm::sys::AddSignalHandler(void (*FnPtr)(void *), void *Cookie) {
CallBacksToRun.push_back(std::make_pair(FnPtr, Cookie));
CallBacksToRun->push_back(std::make_pair(FnPtr, Cookie));
RegisterHandlers();
}