From c7efca6d9b0db7305f5352ebf15d915ae5a1fa24 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 26 Nov 2023 09:49:12 +0100 Subject: Bug 1479: NativeLibrary: Add getNativeLibraryPath() returning queried used native library path, supported throughout DynamicLibraryBundle[Info] Motivation: It is helpful to retrieve the actually used native library pathname, since loading a library w/o absolute path but lookup through LD_LIBRARY_PATH may render it hard for the user to determine which library is used. +++ +++ Windows implementation simply can use GetModuleFileNameA() with the native library handle. POSIX implementation may utilize a symbol-name to retrieve its address within the loading native library used to retrieved the library information via dladdr(). To support this feature throughout DynamicLibraryBundle and DynamicLibraryBundleInfo, the custom DynamicLibraryBundleInfo specializations shall provide optional symbol-names per each tool-library-name for the POSIX implementation, see above. public interface DynamicLibraryBundleInfo { ... /** * Returns optional list of optional symbol names per {@link #getToolLibNames()} * in same order for an OS which requires the symbol's address to retrieve * the path of the containing library. */ public List getSymbolForToolLibPath(); ... } --- src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java') diff --git a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java index 04f13fb..a99cb35 100644 --- a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java +++ b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java @@ -41,6 +41,9 @@ public final class WindowsDynamicLinkerImpl extends DynamicLinkerImpl { /** Interface to C language function:
HANDLE LoadLibraryW(LPCWSTR lpLibFileName); */ private static native long LoadLibraryW(java.lang.String lpLibFileName); + /** Interface to C language function:
PROC GetModuleFileNameA(HANDLE hModule, LPSTR lpFilename, DWORD nSize); */ + private static native java.lang.String GetModuleFileNameA(long hModule); + @Override protected final long openLibraryLocalImpl(final String libraryName) throws SecurityException { // How does that work under Windows ? @@ -53,6 +56,12 @@ public final class WindowsDynamicLinkerImpl extends DynamicLinkerImpl { return LoadLibraryW(libraryName); } + @Override + protected final String lookupLibraryPathnameImpl(final long libraryHandle, final String symbolName) throws SecurityException { + // symbolName is not required + return 0 != libraryHandle ? GetModuleFileNameA(libraryHandle) : null; + } + @Override protected final long lookupSymbolGlobalImpl(final String symbolName) throws SecurityException { if(DEBUG_LOOKUP) { -- cgit v1.2.3