X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSystem%2FDynamicLibrary.cpp;h=3da50a28b656b97e12fe768c2d6ce3d20ee2a2f3;hb=87e0697a46ad214be0d8fce0955494f4085de95a;hp=8a1dec2169b509b4e0d7714de760c7a97ac8fe2a;hpb=a867cf026506dfb2bb530df74ead69eac5e62b51;p=oota-llvm.git diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp index 8a1dec2169b..3da50a28b65 100644 --- a/lib/System/DynamicLibrary.cpp +++ b/lib/System/DynamicLibrary.cpp @@ -2,41 +2,57 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by Reid Spencer and is distributed under the -// University of Illinois Open Source License. See LICENSE.TXT for details. +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // // This header file implements the operating system DynamicLibrary concept. // +// FIXME: This file leaks the ExplicitSymbols and OpenedHandles vector, and is +// not thread safe! +// //===----------------------------------------------------------------------===// #include "llvm/System/DynamicLibrary.h" +#include "llvm/System/Mutex.h" #include "llvm/Config/config.h" +#include +#include #include +#include // Collection of symbol name/value pairs to be searched prior to any libraries. -static std::map g_symbols; +static std::map *ExplicitSymbols = 0; + +namespace { + +struct ExplicitSymbolsDeleter { + ~ExplicitSymbolsDeleter() { + if (ExplicitSymbols) + delete ExplicitSymbols; + } +}; + +} + +static ExplicitSymbolsDeleter Dummy; void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName, void *symbolValue) { - g_symbols[symbolName] = symbolValue; + if (ExplicitSymbols == 0) + ExplicitSymbols = new std::map(); + (*ExplicitSymbols)[symbolName] = symbolValue; } -// It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL -// license and special exception would cause all of LLVM to be placed under -// the LGPL. This is because the exception applies only when libtool is -// used, and obviously libtool is not used with Visual Studio. An entirely -// separate implementation is provided in win32/DynamicLibrary.cpp. - #ifdef LLVM_ON_WIN32 #include "Win32/DynamicLibrary.inc" #else -#include "ltdl.h" -#include +#if HAVE_DLFCN_H +#include using namespace llvm; using namespace llvm::sys; @@ -45,126 +61,74 @@ using namespace llvm::sys; //=== independent code. //===----------------------------------------------------------------------===// -static inline void check_ltdl_initialization() { - static bool did_initialize_ltdl = false; - if (!did_initialize_ltdl) { - int Err = lt_dlinit(); - assert(0 == Err && "Can't init the ltdl library"); - did_initialize_ltdl = true; - } -} - -static std::vector OpenedHandles; +static SmartMutex HandlesMutex; +static std::vector *OpenedHandles = 0; -DynamicLibrary::DynamicLibrary() : handle(0) { - check_ltdl_initialization(); - - lt_dlhandle a_handle = lt_dlopen(0); - - assert(a_handle == 0 || "Can't open program as dynamic library"); - - handle = a_handle; - OpenedHandles.push_back(a_handle); -} - -/* -DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) { - check_ltdl_initialization(); - - lt_dlhandle a_handle = lt_dlopen(filename); - - if (a_handle == 0) - a_handle = lt_dlopenext(filename); - - if (a_handle == 0) - throw std::string("Can't open :") + filename + ": " + lt_dlerror(); - - handle = a_handle; - OpenedHandles.push_back(a_handle); -} -*/ - -DynamicLibrary::~DynamicLibrary() { - lt_dlhandle a_handle = (lt_dlhandle) handle; - if (a_handle) { - lt_dlclose(a_handle); - - for (std::vector::iterator I = OpenedHandles.begin(), - E = OpenedHandles.end(); I != E; ++I) { - if (*I == a_handle) { - // Note: don't use the swap/pop_back trick here. Order is important. - OpenedHandles.erase(I); - return; - } - } - } -} bool DynamicLibrary::LoadLibraryPermanently(const char *Filename, std::string *ErrMsg) { - check_ltdl_initialization(); - lt_dlhandle a_handle = lt_dlopen(Filename); - - if (a_handle == 0) - a_handle = lt_dlopenext(Filename); - - if (a_handle == 0) { - if (ErrMsg) - *ErrMsg = std::string("Can't open :") + - (Filename ? Filename : "") + ": " + lt_dlerror(); + void *H = dlopen(Filename, RTLD_LAZY|RTLD_GLOBAL); + if (H == 0) { + if (ErrMsg) *ErrMsg = dlerror(); return true; } +#ifdef __CYGWIN__ + // Cygwin searches symbols only in the main + // with the handle of dlopen(NULL, RTLD_GLOBAL). + if (Filename == NULL) + H = RTLD_DEFAULT; +#endif + SmartScopedLock Lock(HandlesMutex); + if (OpenedHandles == 0) + OpenedHandles = new std::vector(); + OpenedHandles->push_back(H); + return false; +} +#else - lt_dlmakeresident(a_handle); +using namespace llvm; +using namespace llvm::sys; - OpenedHandles.push_back(a_handle); - return false; +bool DynamicLibrary::LoadLibraryPermanently(const char *Filename, + std::string *ErrMsg) { + if (ErrMsg) *ErrMsg = "dlopen() not supported on this platform"; + return true; +} +#endif + +namespace llvm { +void *SearchForAddressOfSpecialSymbol(const char* symbolName); } void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { - check_ltdl_initialization(); - // First check symbols added via AddSymbol(). - std::map::iterator I = g_symbols.find(symbolName); - if (I != g_symbols.end()) - return I->second; - - // Now search the libraries. - for (std::vector::iterator I = OpenedHandles.begin(), - E = OpenedHandles.end(); I != E; ++I) { - lt_ptr ptr = lt_dlsym(*I, symbolName); - if (ptr) - return ptr; + if (ExplicitSymbols) { + std::map::iterator I = + ExplicitSymbols->find(symbolName); + std::map::iterator E = ExplicitSymbols->end(); + + if (I != E) + return I->second; } - // If this is darwin, it has some funky issues, try to solve them here. Some - // important symbols are marked 'private external' which doesn't allow - // SearchForAddressOfSymbol to find them. As such, we special case them here, - // there is only a small handful of them. - -#ifdef __APPLE__ -#define EXPLICIT_SYMBOL(SYM) \ - extern void *SYM; if (!strcmp(symbolName, #SYM)) return &SYM - { - EXPLICIT_SYMBOL(__ashldi3); - EXPLICIT_SYMBOL(__ashrdi3); - EXPLICIT_SYMBOL(__cmpdi2); - EXPLICIT_SYMBOL(__divdi3); - EXPLICIT_SYMBOL(__eprintf); - EXPLICIT_SYMBOL(__fixdfdi); - EXPLICIT_SYMBOL(__fixsfdi); - EXPLICIT_SYMBOL(__fixunsdfdi); - EXPLICIT_SYMBOL(__fixunssfdi); - EXPLICIT_SYMBOL(__floatdidf); - EXPLICIT_SYMBOL(__floatdisf); - EXPLICIT_SYMBOL(__lshrdi3); - EXPLICIT_SYMBOL(__moddi3); - EXPLICIT_SYMBOL(__udivdi3); - EXPLICIT_SYMBOL(__umoddi3); +#if HAVE_DLFCN_H + // Now search the libraries. + SmartScopedLock Lock(HandlesMutex); + if (OpenedHandles) { + for (std::vector::iterator I = OpenedHandles->begin(), + E = OpenedHandles->end(); I != E; ++I) { + //lt_ptr ptr = lt_dlsym(*I, symbolName); + void *ptr = dlsym(*I, symbolName); + if (ptr) { + return ptr; + } + } } -#undef EXPLICIT_SYMBOL #endif + if (void *Result = llvm::SearchForAddressOfSpecialSymbol(symbolName)) + return Result; + // This macro returns the address of a well-known, explicit symbol #define EXPLICIT_SYMBOL(SYM) \ if (!strcmp(symbolName, #SYM)) return &SYM @@ -198,11 +162,4 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { return 0; } -void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) { - assert(handle != 0 && "Invalid DynamicLibrary handle"); - return lt_dlsym((lt_dlhandle) handle, symbolName); -} - #endif // LLVM_ON_WIN32 - -DEFINING_FILE_FOR(SystemDynamicLibrary)