6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-18 10:31:57 +00:00
Code Issues Projects Releases Wiki Activity

Use thread-safe statics to avoid a static constructor here. This isn't thread-safe on MSVC, but we don't

Browse Source 
support threaded LLVM there anyways.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119718 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2010-11-18 18:49:05 +00:00
parent bd77d399c4
commit 27cb5e612a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/System/DynamicLibrary.cpp
View File

@ -61,9 +61,19 @@ using namespace llvm::sys;
//=== independent code. //=== independent code.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
static SmartMutex<true> HandlesMutex; static SmartMutex<true>* HandlesMutex;
static std::vector<void *> *OpenedHandles = 0; static std::vector<void *> *OpenedHandles = 0;
static bool InitializeMutex() {
HandlesMutex = new SmartMutex<true>;
return HandlesMutex != 0;
}
static bool EnsureMutexInitialized() {
static bool result = InitializeMutex();
return result;
}
bool DynamicLibrary::LoadLibraryPermanently(const char *Filename, bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
std::string *ErrMsg) { std::string *ErrMsg) {
@ -78,7 +88,8 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
if (Filename == NULL) if (Filename == NULL)
H = RTLD_DEFAULT; H = RTLD_DEFAULT;
#endif #endif
SmartScopedLock<true> Lock(HandlesMutex); EnsureMutexInitialized();
SmartScopedLock<true> Lock(*HandlesMutex);
if (OpenedHandles == 0) if (OpenedHandles == 0)
OpenedHandles = new std::vector<void *>(); OpenedHandles = new std::vector<void *>();
OpenedHandles->push_back(H); OpenedHandles->push_back(H);
@ -113,7 +124,8 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
// Now search the libraries. // Now search the libraries.
SmartScopedLock<true> Lock(HandlesMutex); EnsureMutexInitialized();
SmartScopedLock<true> Lock(*HandlesMutex);
if (OpenedHandles) { if (OpenedHandles) {
for (std::vector<void *>::iterator I = OpenedHandles->begin(), for (std::vector<void *>::iterator I = OpenedHandles->begin(),
E = OpenedHandles->end(); I != E; ++I) { E = OpenedHandles->end(); I != E; ++I) {