mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-22 10:29:35 +00:00
Make DynamicLibrary use ManagedStatic. This is pretty simple and should just work as
advertised - but it does have the caveat that calls to DynamicLibrary::AddSymbol will "reset" if you shutdown llvm and try to come back for seconds. This is a subtle behavior change, but I'm assuming that nobody is affected by it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190946 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
69f99bf3a3
commit
b4b9b3b24c
@ -14,6 +14,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "llvm/Support/DynamicLibrary.h"
|
||||
#include "llvm/Support/ManagedStatic.h"
|
||||
#include "llvm/ADT/DenseSet.h"
|
||||
#include "llvm/ADT/StringMap.h"
|
||||
#include "llvm/Config/config.h"
|
||||
@ -22,31 +23,12 @@
|
||||
#include <cstring>
|
||||
|
||||
// Collection of symbol name/value pairs to be searched prior to any libraries.
|
||||
static llvm::StringMap<void *> *ExplicitSymbols = 0;
|
||||
|
||||
namespace {
|
||||
|
||||
struct ExplicitSymbolsDeleter {
|
||||
~ExplicitSymbolsDeleter() {
|
||||
delete ExplicitSymbols;
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
static ExplicitSymbolsDeleter Dummy;
|
||||
|
||||
|
||||
static llvm::sys::SmartMutex<true>& getMutex() {
|
||||
static llvm::sys::SmartMutex<true> HandlesMutex;
|
||||
return HandlesMutex;
|
||||
}
|
||||
static llvm::ManagedStatic<llvm::StringMap<void *> > ExplicitSymbols;
|
||||
static llvm::ManagedStatic<llvm::sys::SmartMutex<true> > SymbolsMutex;
|
||||
|
||||
void llvm::sys::DynamicLibrary::AddSymbol(StringRef symbolName,
|
||||
void *symbolValue) {
|
||||
SmartScopedLock<true> lock(getMutex());
|
||||
if (ExplicitSymbols == 0)
|
||||
ExplicitSymbols = new StringMap<void*>();
|
||||
SmartScopedLock<true> lock(*SymbolsMutex);
|
||||
(*ExplicitSymbols)[symbolName] = symbolValue;
|
||||
}
|
||||
|
||||
@ -72,7 +54,7 @@ static DenseSet<void *> *OpenedHandles = 0;
|
||||
|
||||
DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
||||
std::string *errMsg) {
|
||||
SmartScopedLock<true> lock(getMutex());
|
||||
SmartScopedLock<true> lock(*SymbolsMutex);
|
||||
|
||||
void *handle = dlopen(filename, RTLD_LAZY|RTLD_GLOBAL);
|
||||
if (handle == 0) {
|
||||
@ -126,10 +108,10 @@ void *SearchForAddressOfSpecialSymbol(const char* symbolName);
|
||||
}
|
||||
|
||||
void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
|
||||
SmartScopedLock<true> Lock(getMutex());
|
||||
SmartScopedLock<true> Lock(*SymbolsMutex);
|
||||
|
||||
// First check symbols added via AddSymbol().
|
||||
if (ExplicitSymbols) {
|
||||
if (ExplicitSymbols.isConstructed()) {
|
||||
StringMap<void *>::iterator i = ExplicitSymbols->find(symbolName);
|
||||
|
||||
if (i != ExplicitSymbols->end())
|
||||
|
@ -71,7 +71,7 @@ extern "C" {
|
||||
|
||||
DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
||||
std::string *errMsg) {
|
||||
SmartScopedLock<true> lock(getMutex());
|
||||
SmartScopedLock<true> lock(*SymbolsMutex);
|
||||
|
||||
if (!filename) {
|
||||
// When no file is specified, enumerate all DLLs and EXEs in the process.
|
||||
@ -114,10 +114,10 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
|
||||
#undef EXPLICIT_SYMBOL2
|
||||
|
||||
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
|
||||
SmartScopedLock<true> Lock(getMutex());
|
||||
SmartScopedLock<true> Lock(*SymbolsMutex);
|
||||
|
||||
// First check symbols added via AddSymbol().
|
||||
if (ExplicitSymbols) {
|
||||
if (ExplicitSymbols.isConstructed()) {
|
||||
StringMap<void *>::iterator i = ExplicitSymbols->find(symbolName);
|
||||
|
||||
if (i != ExplicitSymbols->end())
|
||||
|
Loading…
Reference in New Issue
Block a user