OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages 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 

support threaded LLVM there anyways.

llvm-svn: 119718
This commit is contained in:
Owen Anderson 2010-11-18 18:49:05 +00:00
parent e4f7ec17f8
commit aa398c1617
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/System/DynamicLibrary.cpp
View File

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