public:
/// This function allows a library to be loaded without instantiating a
/// DynamicLibrary object. Consequently, it is marked as being permanent
- /// and will only be unloaded when the program terminates.
- /// @throws std::string on error.
+ /// and will only be unloaded when the program terminates. This returns
+ /// false on success or returns true and fills in *ErrMsg on failure.
/// @brief Open a dynamic library permanently.
- static void LoadLibraryPermanently(const char* filename);
+ static bool LoadLibraryPermanently(const char* filename,
+ std::string *ErrMsg = 0);
/// This function will search through all previously loaded dynamic
/// libraries for the symbol \p symbolName. If it is found, the addressof
// Collection of symbol name/value pairs to be searched prior to any libraries.
static std::map<std::string, void *> g_symbols;
-void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName, void *symbolValue) {
+void llvm::sys::DynamicLibrary::AddSymbol(const char* symbolName,
+ void *symbolValue) {
g_symbols[symbolName] = symbolValue;
}
}
}
-void DynamicLibrary::LoadLibraryPermanently(const char* filename) {
+bool DynamicLibrary::LoadLibraryPermanently(const char *Filename,
+ std::string *ErrMsg) {
check_ltdl_initialization();
- lt_dlhandle a_handle = lt_dlopen(filename);
+ lt_dlhandle a_handle = lt_dlopen(Filename);
if (a_handle == 0)
- a_handle = lt_dlopenext(filename);
+ a_handle = lt_dlopenext(Filename);
- if (a_handle == 0)
- throw std::string("Can't open :") +
- (filename ? filename : "<current process>") + ": " + lt_dlerror();
+ if (a_handle == 0) {
+ if (ErrMsg)
+ *ErrMsg = std::string("Can't open :") +
+ (Filename ? Filename : "<current process>") + ": " + lt_dlerror();
+ return true;
+ }
lt_dlmakeresident(a_handle);
OpenedHandles.push_back(a_handle);
+ return false;
}
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
}
}
-void DynamicLibrary::LoadLibraryPermanently(const char* filename) {
+bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
+ std::string *ErrMsg) {
if (filename) {
HMODULE a_handle = LoadLibrary(filename);
if (a_handle == 0)
- ThrowError(std::string(filename) + ": Can't open : ");
+ return GetError(std::string(filename) + ": Can't open : ", ErrMsg);
OpenedHandles.push_back(a_handle);
} else {
// Because we don't remember the handle, we will never free it; hence,
// it is loaded permanently.
+ return false;
}
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {