6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-01 01:30:36 +00:00
Code Issues Projects Releases Wiki Activity

Make DynamicLibrary thread-safe w/r/t call to dlerror() after dlopen(). PR10718

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138260 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jordy Rose 2011-08-22 19:01:52 +00:00
parent 11e03e7c2d
commit eeb37f1a56
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Support/DynamicLibrary.cpp
View File

@ -72,6 +72,8 @@ static DenseSet<void *> *OpenedHandles = 0;
DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
std::string *errMsg) { std::string *errMsg) {
SmartScopedLock<true> lock(getMutex());
void *handle = dlopen(filename, RTLD_LAZY|RTLD_GLOBAL); void *handle = dlopen(filename, RTLD_LAZY|RTLD_GLOBAL);
if (handle == 0) { if (handle == 0) {
if (errMsg) *errMsg = dlerror(); if (errMsg) *errMsg = dlerror();
@ -85,7 +87,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
handle = RTLD_DEFAULT; handle = RTLD_DEFAULT;
#endif #endif
SmartScopedLock<true> lock(getMutex());
if (OpenedHandles == 0) if (OpenedHandles == 0)
OpenedHandles = new DenseSet<void *>(); OpenedHandles = new DenseSet<void *>();

4
lib/Support/Windows/DynamicLibrary.inc
View File

@ -71,9 +71,10 @@ extern "C" {
DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
std::string *errMsg) { std::string *errMsg) {
SmartScopedLock<true> lock(getMutex());
if (!filename) { if (!filename) {
// When no file is specified, enumerate all DLLs and EXEs in the process. // When no file is specified, enumerate all DLLs and EXEs in the process.
SmartScopedLock<true> lock(getMutex());
if (OpenedHandles == 0) if (OpenedHandles == 0)
OpenedHandles = new DenseSet<HMODULE>(); OpenedHandles = new DenseSet<HMODULE>();
@ -90,7 +91,6 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename,
return DynamicLibrary(); return DynamicLibrary();
} }
SmartScopedLock<true> lock(getMutex());
if (OpenedHandles == 0) if (OpenedHandles == 0)
OpenedHandles = new DenseSet<HMODULE>(); OpenedHandles = new DenseSet<HMODULE>();