[llvm] r296442 - Allow externally dlopen-ed libraries to be registered as permanent libraries.
Vassil Vassilev via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 27 23:11:59 PST 2017
Author: vvassilev
Date: Tue Feb 28 01:11:59 2017
New Revision: 296442
URL: http://llvm.org/viewvc/llvm-project?rev=296442&view=rev
Log:
Allow externally dlopen-ed libraries to be registered as permanent libraries.
This is also useful in cases when llvm is in a shared library. First we dlopen
the llvm shared library and then we register it as a permanent library in order
to keep the JIT and other services working.
Patch reviewed by Vedant Kumar (D29955)!
Modified:
llvm/trunk/include/llvm/Support/DynamicLibrary.h
llvm/trunk/lib/Support/DynamicLibrary.cpp
llvm/trunk/lib/Support/Windows/DynamicLibrary.inc
Modified: llvm/trunk/include/llvm/Support/DynamicLibrary.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/DynamicLibrary.h?rev=296442&r1=296441&r2=296442&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/DynamicLibrary.h (original)
+++ llvm/trunk/include/llvm/Support/DynamicLibrary.h Tue Feb 28 01:11:59 2017
@@ -14,6 +14,8 @@
#ifndef LLVM_SUPPORT_DYNAMICLIBRARY_H
#define LLVM_SUPPORT_DYNAMICLIBRARY_H
+#include "llvm/Support/Mutex.h"
+
#include <string>
namespace llvm {
@@ -43,6 +45,11 @@ namespace sys {
// Opaque data used to interface with OS-specific dynamic library handling.
void *Data;
+ // Adds a opened library handle to the list of OpenedHandles.
+ static DynamicLibrary addPermanentLibraryWithLock(void *handle,
+ sys::SmartScopedLock<true> &,
+ bool isMainExec);
+
public:
explicit DynamicLibrary(void *data = &Invalid) : Data(data) {}
@@ -68,6 +75,14 @@ namespace sys {
static DynamicLibrary getPermanentLibrary(const char *filename,
std::string *errMsg = nullptr);
+ /// Registers an externally loaded library. The library will be unloaded
+ /// when the program terminates.
+ ///
+ /// It is safe to call this function multiple times for the same library.
+ ///
+ /// \returns An empty \p DynamicLibrary on failure.
+ static DynamicLibrary addPermanentLibrary(void *handle);
+
/// This function permanently loads the dynamic library at the given path.
/// Use this instead of getPermanentLibrary() when you won't need to get
/// symbols from the library itself.
Modified: llvm/trunk/lib/Support/DynamicLibrary.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/DynamicLibrary.cpp?rev=296442&r1=296441&r2=296442&view=diff
==============================================================================
--- llvm/trunk/lib/Support/DynamicLibrary.cpp (original)
+++ llvm/trunk/lib/Support/DynamicLibrary.cpp Tue Feb 28 01:11:59 2017
@@ -68,10 +68,34 @@ DynamicLibrary DynamicLibrary::getPerman
handle = RTLD_DEFAULT;
#endif
+ DynamicLibrary dyLib = addPermanentLibraryWithLock(handle, lock, !filename);
+
// If we've already loaded this library, dlclose() the handle in order to
// keep the internal refcount at +1.
- if (!OpenedHandles->insert(handle).second)
+ if (!dyLib.isValid()) {
+ if (errMsg)
+ *errMsg = (filename) ? std::string(filename) : std::string() +
+ ": Library already loaded";
dlclose(handle);
+ }
+
+ return dyLib;
+}
+
+DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle) {
+ SmartScopedLock<true> lock(*SymbolsMutex);
+ return addPermanentLibraryWithLock(handle, lock, false);
+}
+
+DynamicLibrary DynamicLibrary::addPermanentLibraryWithLock(void *handle,
+ sys::SmartScopedLock<true> &,
+ bool isMainExec) {
+ // If we've already loaded this library, tell the caller.
+ // FIXME: Note that multiple requests for adding the main executable is not
+ // considered as an error. If we don't want to treat the main executable as a
+ // special case we need to do a cleanup in the MCJIT tests and API.
+ if (!OpenedHandles->insert(handle).second && !isMainExec)
+ return DynamicLibrary();
return DynamicLibrary(handle);
}
Modified: llvm/trunk/lib/Support/Windows/DynamicLibrary.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/DynamicLibrary.inc?rev=296442&r1=296441&r2=296442&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/DynamicLibrary.inc (original)
+++ llvm/trunk/lib/Support/Windows/DynamicLibrary.inc Tue Feb 28 01:11:59 2017
@@ -9,8 +9,6 @@
//
// This file provides the Win32 specific implementation of DynamicLibrary.
//
-// FIXME: This file leaks OpenedHandles!
-//
//===----------------------------------------------------------------------===//
#include "WindowsSupport.h"
@@ -35,7 +33,7 @@ using namespace sys;
typedef BOOL (WINAPI *fpEnumerateLoadedModules)(HANDLE,PENUMLOADED_MODULES_CALLBACK64,PVOID);
static fpEnumerateLoadedModules fEnumerateLoadedModules;
-static DenseSet<HMODULE> *OpenedHandles;
+static llvm::ManagedStatic<DenseSet<HMODULE> > OpenedHandles;
static bool loadDebugHelp(void) {
HMODULE hLib = ::LoadLibraryW(L"Dbghelp.dll");
@@ -59,9 +57,6 @@ DynamicLibrary DynamicLibrary::getPerman
if (!filename) {
// When no file is specified, enumerate all DLLs and EXEs in the process.
- if (OpenedHandles == 0)
- OpenedHandles = new DenseSet<HMODULE>();
-
if (!fEnumerateLoadedModules) {
if (!loadDebugHelp()) {
assert(false && "These APIs should always be available");
@@ -81,7 +76,7 @@ DynamicLibrary DynamicLibrary::getPerman
MakeErrMsg(errMsg, std::string(filename) + ": Can't convert to UTF-16");
return DynamicLibrary();
}
-
+
HMODULE a_handle = LoadLibraryW(filenameUnicode.data());
if (a_handle == 0) {
@@ -89,15 +84,33 @@ DynamicLibrary DynamicLibrary::getPerman
return DynamicLibrary();
}
- if (OpenedHandles == 0)
- OpenedHandles = new DenseSet<HMODULE>();
-
+ DynamicLibrary dyLib = addPermanentLibraryWithLock(a_handle, lock, !filename);
// If we've already loaded this library, FreeLibrary() the handle in order to
// keep the internal refcount at +1.
- if (!OpenedHandles->insert(a_handle).second)
+ if (!dyLib.isValid()) {
+ MakeErrMsg(errMsg, std::string(filename) + ": Already loaded");
FreeLibrary(a_handle);
+ }
+
+ return dyLib;
+}
+
+DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle) {
+ SmartScopedLock<true> lock(*SymbolsMutex);
+ return addPermanentLibraryWithLock(handle, lock);
+}
+
+DynamicLibrary DynamicLibrary::addPermanentLibraryWithLock(void *handle,
+ sys::SmartScopedLock<true> &,
+ bool isMainExec) {
+ // If we've already loaded this library, tell the caller.
+ // FIXME: Note that multiple requests for adding the main executable is not
+ // considered as an error. If we don't want to treat the main executable as a
+ // special case we need to do a cleanup in the MCJIT tests and API.
+ if (!OpenedHandles->insert((const HMODULE)handle).second && !isMainExec)
+ return DynamicLibrary();
- return DynamicLibrary(a_handle);
+ return DynamicLibrary((HMODULE)handle);
}
// Stack probing routines are in the support library (e.g. libgcc), but we don't
More information about the llvm-commits
mailing list