diff options
6 files changed, 207 insertions, 136 deletions
diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index 349106a..b47c69b 100644 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -64,15 +64,16 @@ import com.jogamp.common.util.awt.AWTEDTExecutor; public class DynamicLibraryBundle implements DynamicLookupHelper { public static final boolean USE_CURRENT_THREAD_LIBLOADER = Debug.debug("NativeLibrary.UseCurrentThreadLibLoader"); - private DynamicLibraryBundleInfo info; + private final DynamicLibraryBundleInfo info; - private List<List<String>> toolLibNames; - private boolean[] toolLibLoaded; + protected final List<NativeLibrary> nativeLibraries; + private final List<List<String>> toolLibNames; + private final List<String> glueLibNames; + private final boolean[] toolLibLoaded; + private int toolLibLoadedNumber; - protected List<NativeLibrary> nativeLibraries; - private List<String> glueLibNames; - private boolean[] glueLibLoaded; + private final boolean[] glueLibLoaded; private int glueLibLoadedNumber; private long toolGetProcAddressHandle; @@ -107,10 +108,30 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { nativeLibraries = new ArrayList<NativeLibrary>(); toolLibNames = info.getToolLibNames(); glueLibNames = info.getGlueLibNames(); + toolLibLoaded = new boolean[toolLibNames.size()]; + if(DEBUG) { + if( toolLibNames.size() == 0 ) { + System.err.println("No Tool native library names given"); + } + + if( glueLibNames.size() == 0 ) { + System.err.println("No Glue native library names given"); + } + } + + for(int i=toolLibNames.size()-1; i>=0; i--) { + toolLibLoaded[i] = false; + } + glueLibLoaded = new boolean[glueLibNames.size()]; + for(int i=glueLibNames.size()-1; i>=0; i--) { + glueLibLoaded[i] = false; + } + info.getLibLoaderExecutor().invoke(true, new Runnable() { public void run() { loadLibraries(); } } ) ; + toolGetProcAddressFuncNameList = info.getToolGetProcAddressFuncNameList(); if( null != toolGetProcAddressFuncNameList ) { toolGetProcAddressFuncNameSet = new HashSet<String>(toolGetProcAddressFuncNameList); @@ -134,7 +155,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } /** Unload all {@link NativeLibrary}s, and remove all references. */ - public void destroy() { + public final void destroy() { if(DEBUG) { System.err.println(Thread.currentThread().getName()+" - DynamicLibraryBundle.destroy() START: "+info.getClass().getName()); } @@ -145,13 +166,11 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { nativeLibraries.get(i).close(); } nativeLibraries.clear(); - nativeLibraries = null; - toolLibNames = null; - glueLibNames = null; + toolLibNames.clear(); + glueLibNames.clear(); if(DEBUG) { System.err.println(Thread.currentThread().getName()+" - DynamicLibraryBundle.destroy() END: "+info.getClass().getName()); } - info = null; } public final boolean isLibComplete() { @@ -215,7 +234,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { public final DynamicLibraryBundleInfo getBundleInfo() { return info; } - protected long getToolGetProcAddressHandle() { + protected final long getToolGetProcAddressHandle() { if(!isToolLibLoaded()) { return 0; } @@ -230,7 +249,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return aptr; } - protected NativeLibrary loadFirstAvailable(List<String> libNames, ClassLoader loader, boolean global) { + protected final NativeLibrary loadFirstAvailable(List<String> libNames, ClassLoader loader, boolean global) { for (int i=0; i < libNames.size(); i++) { final NativeLibrary lib = NativeLibrary.open(libNames.get(i), loader, global); if (lib != null) { @@ -240,27 +259,8 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return null; } - private void loadLibraries() { + private final void loadLibraries() { int i; - toolLibLoaded = new boolean[toolLibNames.size()]; - for(i=toolLibNames.size()-1; i>=0; i--) { - toolLibLoaded[i] = false; - } - glueLibLoaded = new boolean[glueLibNames.size()]; - for(i=glueLibNames.size()-1; i>=0; i--) { - glueLibLoaded[i] = false; - } - - if(DEBUG) { - if( toolLibNames.size() == 0 ) { - System.err.println("No Tool native library names given"); - } - - if( glueLibNames.size() == 0 ) { - System.err.println("No Glue native library names given"); - } - } - toolLibLoadedNumber = 0; final ClassLoader cl = info.getClass().getClassLoader(); NativeLibrary lib = null; @@ -314,7 +314,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } } - private long dynamicLookupFunctionOnLibs(String funcName) { + private final long dynamicLookupFunctionOnLibs(String funcName) { if(!isToolLibLoaded() || null==funcName) { if(DEBUG_LOOKUP && !isToolLibLoaded()) { System.err.println("Lookup-Native: <" + funcName + "> ** FAILED ** Tool native library not loaded"); @@ -344,7 +344,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return addr; } - private long toolDynamicLookupFunction(String funcName) { + private final long toolDynamicLookupFunction(String funcName) { if(0 != toolGetProcAddressHandle) { long addr = info.toolGetProcAddress(toolGetProcAddressHandle, funcName); if(DEBUG_LOOKUP) { @@ -357,7 +357,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { return 0; } - public long dynamicLookupFunction(String funcName) { + public final long dynamicLookupFunction(String funcName) { if(!isToolLibLoaded() || null==funcName) { if(DEBUG_LOOKUP && !isToolLibLoaded()) { System.err.println("Lookup: <" + funcName + "> ** FAILED ** Tool native library not loaded"); @@ -385,7 +385,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } /** Inherit access */ - static class GlueJNILibLoader extends JNILibLoaderBase { + static final class GlueJNILibLoader extends JNILibLoaderBase { protected static synchronized boolean loadLibrary(String libname, boolean ignoreError, ClassLoader cl) { return JNILibLoaderBase.loadLibrary(libname, ignoreError, cl); } diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java index f39ac77..d34620e 100644 --- a/src/java/com/jogamp/common/os/NativeLibrary.java +++ b/src/java/com/jogamp/common/os/NativeLibrary.java @@ -46,7 +46,7 @@ import com.jogamp.common.util.cache.TempJarCache; import jogamp.common.os.BionicDynamicLinkerImpl; import jogamp.common.os.MacOSXDynamicLinkerImpl; import jogamp.common.os.PlatformPropsImpl; -import jogamp.common.os.UnixDynamicLinkerImpl; +import jogamp.common.os.PosixDynamicLinkerImpl; import jogamp.common.os.WindowsDynamicLinkerImpl; import java.io.*; @@ -68,10 +68,10 @@ import java.util.*; ProcAddressTable glue code generation style without additional supporting code needed in the generated library. */ -public class NativeLibrary implements DynamicLookupHelper { - private static DynamicLinker dynLink; - private static String[] prefixes; - private static String[] suffixes; +public final class NativeLibrary implements DynamicLookupHelper { + private static final DynamicLinker dynLink; + private static final String[] prefixes; + private static final String[] suffixes; static { // Instantiate dynamic linker implementation @@ -101,7 +101,7 @@ public class NativeLibrary implements DynamicLookupHelper { case OPENKODE: case LINUX: */ default: - dynLink = new UnixDynamicLinkerImpl(); + dynLink = new PosixDynamicLinkerImpl(); prefixes = new String[] { "lib" }; suffixes = new String[] { ".so" }; break; @@ -114,9 +114,9 @@ public class NativeLibrary implements DynamicLookupHelper { private long libraryHandle; // May as well keep around the path to the library we opened - private String libraryPath; + private final String libraryPath; - private boolean global; + private final boolean global; // Private constructor to prevent arbitrary instances from floating around private NativeLibrary(long libraryHandle, String libraryPath, boolean global) { @@ -128,7 +128,7 @@ public class NativeLibrary implements DynamicLookupHelper { } } - public String toString() { + public final String toString() { return "NativeLibrary[" + libraryPath + ", 0x" + Long.toHexString(libraryHandle) + ", global " + global + "]"; } @@ -136,7 +136,7 @@ public class NativeLibrary implements DynamicLookupHelper { name on all platforms, looking first in the system's search path, and in the context of the specified ClassLoader, which is used to help find the library in the case of e.g. Java Web Start. */ - public static NativeLibrary open(String libName, ClassLoader loader) { + public static final NativeLibrary open(String libName, ClassLoader loader) { return open(libName, libName, libName, true, loader, true); } @@ -144,7 +144,7 @@ public class NativeLibrary implements DynamicLookupHelper { name on all platforms, looking first in the system's search path, and in the context of the specified ClassLoader, which is used to help find the library in the case of e.g. Java Web Start. */ - public static NativeLibrary open(String libName, ClassLoader loader, boolean global) { + public static final NativeLibrary open(String libName, ClassLoader loader, boolean global) { return open(libName, libName, libName, true, loader, global); } @@ -163,19 +163,19 @@ public class NativeLibrary implements DynamicLookupHelper { dynamic loading facility is used correctly the version number will be irrelevant. */ - public static NativeLibrary open(String windowsLibName, - String unixLibName, - String macOSXLibName, - boolean searchSystemPathFirst, - ClassLoader loader) { + public static final NativeLibrary open(String windowsLibName, + String unixLibName, + String macOSXLibName, + boolean searchSystemPathFirst, + ClassLoader loader) { return open(windowsLibName, unixLibName, macOSXLibName, searchSystemPathFirst, loader, true); } - public static NativeLibrary open(String windowsLibName, - String unixLibName, - String macOSXLibName, - boolean searchSystemPathFirst, - ClassLoader loader, boolean global) { + public static final NativeLibrary open(String windowsLibName, + String unixLibName, + String macOSXLibName, + boolean searchSystemPathFirst, + ClassLoader loader, boolean global) { List<String> possiblePaths = enumerateLibraryPaths(windowsLibName, unixLibName, macOSXLibName, @@ -228,32 +228,32 @@ public class NativeLibrary implements DynamicLookupHelper { } /** Looks up the given function name in this native library. */ - public long dynamicLookupFunction(String funcName) { + public final long dynamicLookupFunction(String funcName) { if (libraryHandle == 0) throw new RuntimeException("Library is not open"); return dynLink.lookupSymbol(libraryHandle, funcName); } /** Looks up the given function name in all loaded libraries. */ - public static long dynamicLookupFunctionGlobal(String funcName) { + public static final long dynamicLookupFunctionGlobal(String funcName) { return dynLink.lookupSymbolGlobal(funcName); } /** Retrieves the low-level library handle from this NativeLibrary object. On the Windows platform this is an HMODULE, and on Unix and Mac OS X platforms the void* result of calling dlopen(). */ - public long getLibraryHandle() { + public final long getLibraryHandle() { return libraryHandle; } /** Retrieves the path under which this library was opened. */ - public String getLibraryPath() { + public final String getLibraryPath() { return libraryPath; } /** Closes this native library. Further lookup operations are not allowed after calling this method. */ - public void close() { + public final void close() { if (DEBUG) { System.err.println("NativeLibrary.close(): closing " + this); } @@ -278,7 +278,7 @@ public class NativeLibrary implements DynamicLookupHelper { * * @return basename of libName w/o path, ie. /usr/lib/libDrinkBeer.so -> DrinkBeer on Unix systems, but null on Windows. */ - public static String isValidNativeLibraryName(String libName, boolean isLowerCaseAlready) { + public static final String isValidNativeLibraryName(String libName, boolean isLowerCaseAlready) { final String libBaseName; try { libBaseName = IOUtil.getBasename(libName); @@ -307,7 +307,7 @@ public class NativeLibrary implements DynamicLookupHelper { /** Given the base library names (no prefixes/suffixes) for the various platforms, enumerate the possible locations and names of the indicated native library on the system. */ - public static List<String> enumerateLibraryPaths(final String windowsLibName, + public static final List<String> enumerateLibraryPaths(final String windowsLibName, final String unixLibName, final String macOSXLibName, final boolean searchSystemPathFirst, @@ -409,7 +409,7 @@ public class NativeLibrary implements DynamicLookupHelper { } - private static String selectName(String windowsLibName, + private static final String selectName(String windowsLibName, String unixLibName, String macOSXLibName) { switch (PlatformPropsImpl.OS_TYPE) { @@ -431,7 +431,7 @@ public class NativeLibrary implements DynamicLookupHelper { } } - private static String[] buildNames(String libName) { + private static final String[] buildNames(String libName) { // If the library name already has the prefix / suffix added // (principally because we want to force a version number on Unix // operating systems) then just return the library name. @@ -491,7 +491,7 @@ public class NativeLibrary implements DynamicLookupHelper { return res; } - private static void addPaths(String path, String[] baseNames, List<String> paths) { + private static final void addPaths(String path, String[] baseNames, List<String> paths) { for (int j = 0; j < baseNames.length; j++) { paths.add(path + File.separator + baseNames[j]); } @@ -499,7 +499,7 @@ public class NativeLibrary implements DynamicLookupHelper { private static boolean initializedFindLibraryMethod = false; private static Method findLibraryMethod = null; - private static String findLibraryImpl(final String libName, final ClassLoader loader) { + private static final String findLibraryImpl(final String libName, final ClassLoader loader) { if (loader == null) { return null; } @@ -538,7 +538,7 @@ public class NativeLibrary implements DynamicLookupHelper { } return null; } - public static String findLibrary(final String libName, final ClassLoader loader) { + public static final String findLibrary(final String libName, final ClassLoader loader) { String res = null; if(TempJarCache.isInitialized()) { res = TempJarCache.findLibrary(libName); diff --git a/src/java/jogamp/common/os/BionicDynamicLinkerImpl.java b/src/java/jogamp/common/os/BionicDynamicLinkerImpl.java index 3864ab2..488ce99 100644 --- a/src/java/jogamp/common/os/BionicDynamicLinkerImpl.java +++ b/src/java/jogamp/common/os/BionicDynamicLinkerImpl.java @@ -1,3 +1,30 @@ +/** + * Copyright 2013 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ package jogamp.common.os; import com.jogamp.common.util.SecurityUtil; @@ -9,7 +36,7 @@ import com.jogamp.common.util.SecurityUtil; * Bionic is used on Android. * </p> */ -public class BionicDynamicLinkerImpl extends UnixDynamicLinkerImpl { +public final class BionicDynamicLinkerImpl extends UnixDynamicLinkerImpl { private static final long RTLD_DEFAULT = 0xffffffffL; // static final long RTLD_NEXT = 0xfffffffeL; @@ -19,7 +46,7 @@ public class BionicDynamicLinkerImpl extends UnixDynamicLinkerImpl { private static final int RTLD_GLOBAL = 0x00002; // --- Begin CustomJavaCode .cfg declarations - public long openLibraryLocal(String pathname, boolean debug) throws SecurityException { + public final long openLibraryLocal(String pathname, boolean debug) throws SecurityException { // Note we use RTLD_GLOBAL visibility to _NOT_ allow this functionality to // be used to pre-resolve dependent libraries of JNI code without // requiring that all references to symbols in those libraries be @@ -31,7 +58,7 @@ public class BionicDynamicLinkerImpl extends UnixDynamicLinkerImpl { return dlopen(pathname, RTLD_LAZY | RTLD_LOCAL); } - public long openLibraryGlobal(String pathname, boolean debug) throws SecurityException { + public final long openLibraryGlobal(String pathname, boolean debug) throws SecurityException { // Note we use RTLD_GLOBAL visibility to allow this functionality to // be used to pre-resolve dependent libraries of JNI code without // requiring that all references to symbols in those libraries be @@ -43,7 +70,7 @@ public class BionicDynamicLinkerImpl extends UnixDynamicLinkerImpl { return dlopen(pathname, RTLD_LAZY | RTLD_GLOBAL); } - public long lookupSymbolGlobal(String symbolName) { + public final long lookupSymbolGlobal(String symbolName) { final long addr = dlsym(RTLD_DEFAULT, symbolName); if(DEBUG_LOOKUP) { System.err.println("DynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr)); diff --git a/src/java/jogamp/common/os/MacOSXDynamicLinkerImpl.java b/src/java/jogamp/common/os/MacOSXDynamicLinkerImpl.java index 09ee48d..bebddc4 100644 --- a/src/java/jogamp/common/os/MacOSXDynamicLinkerImpl.java +++ b/src/java/jogamp/common/os/MacOSXDynamicLinkerImpl.java @@ -1,3 +1,30 @@ +/** + * Copyright 2013 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ package jogamp.common.os; import com.jogamp.common.util.SecurityUtil; @@ -6,7 +33,7 @@ import com.jogamp.common.util.SecurityUtil; * Mac OS X specialization of {@link UnixDynamicLinkerImpl} * utilizing OS X 's non POSIX flags and mode values. */ -public class MacOSXDynamicLinkerImpl extends UnixDynamicLinkerImpl { +public final class MacOSXDynamicLinkerImpl extends UnixDynamicLinkerImpl { private static final long RTLD_DEFAULT = -2L; // static final long RTLD_NEXT = -1L; @@ -17,7 +44,7 @@ public class MacOSXDynamicLinkerImpl extends UnixDynamicLinkerImpl { private static final int RTLD_GLOBAL = 0x00008; // --- Begin CustomJavaCode .cfg declarations - public long openLibraryLocal(String pathname, boolean debug) throws SecurityException { + public final long openLibraryLocal(String pathname, boolean debug) throws SecurityException { // Note we use RTLD_LOCAL visibility to _NOT_ allow this functionality to // be used to pre-resolve dependent libraries of JNI code without // requiring that all references to symbols in those libraries be @@ -29,7 +56,7 @@ public class MacOSXDynamicLinkerImpl extends UnixDynamicLinkerImpl { return dlopen(pathname, RTLD_LAZY | RTLD_LOCAL); } - public long openLibraryGlobal(String pathname, boolean debug) throws SecurityException { + public final long openLibraryGlobal(String pathname, boolean debug) throws SecurityException { // Note we use RTLD_GLOBAL visibility to allow this functionality to // be used to pre-resolve dependent libraries of JNI code without // requiring that all references to symbols in those libraries be @@ -41,7 +68,7 @@ public class MacOSXDynamicLinkerImpl extends UnixDynamicLinkerImpl { return dlopen(pathname, RTLD_LAZY | RTLD_GLOBAL); } - public long lookupSymbolGlobal(String symbolName) { + public final long lookupSymbolGlobal(String symbolName) { final long addr = dlsym(RTLD_DEFAULT, symbolName); if(DEBUG_LOOKUP) { System.err.println("DynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr)); diff --git a/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java b/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java index 7675977..28e166e 100644 --- a/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java +++ b/src/java/jogamp/common/os/UnixDynamicLinkerImpl.java @@ -1,58 +1,56 @@ +/** + * Copyright 2013 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ package jogamp.common.os; import com.jogamp.common.os.DynamicLinker; -import com.jogamp.common.util.SecurityUtil; +/* pp */ abstract class UnixDynamicLinkerImpl implements DynamicLinker { -public class UnixDynamicLinkerImpl implements DynamicLinker { - - private static final long RTLD_DEFAULT = 0; - // static final long RTLD_NEXT = -1L; - - private static final int RTLD_LAZY = 0x00001; - // static final int RTLD_NOW = 0x00002; - private static final int RTLD_LOCAL = 0x00000; - private static final int RTLD_GLOBAL = 0x00100; - + // + // Package private scope of class w/ protected native code access + // and sealed jogamp.common.* package definition + // ensuring no abuse via subclassing. + // + /** Interface to C language function: <br> <code> int dlclose(void * ); </code> */ - /* pp */ static native int dlclose(long arg0); + protected static native int dlclose(long arg0); /** Interface to C language function: <br> <code> char * dlerror(void); </code> */ - /* pp */ static native java.lang.String dlerror(); + protected static native java.lang.String dlerror(); /** Interface to C language function: <br> <code> void * dlopen(const char * , int); </code> */ - /* pp */ static native long dlopen(java.lang.String arg0, int arg1); + protected static native long dlopen(java.lang.String arg0, int arg1); /** Interface to C language function: <br> <code> void * dlsym(void * , const char * ); </code> */ - /* pp */ static native long dlsym(long arg0, java.lang.String arg1); + protected static native long dlsym(long arg0, java.lang.String arg1); - // --- Begin CustomJavaCode .cfg declarations - public long openLibraryLocal(String pathname, boolean debug) throws SecurityException { - // Note we use RTLD_GLOBAL visibility to _NOT_ allow this functionality to - // be used to pre-resolve dependent libraries of JNI code without - // requiring that all references to symbols in those libraries be - // looked up dynamically via the ProcAddressTable mechanism; in - // other words, one can actually link against the library instead of - // having to dlsym all entry points. System.loadLibrary() uses - // RTLD_LOCAL visibility so can't be used for this purpose. - SecurityUtil.checkLinkPermission(pathname); - return dlopen(pathname, RTLD_LAZY | RTLD_LOCAL); - } - - public long openLibraryGlobal(String pathname, boolean debug) throws SecurityException { - // Note we use RTLD_GLOBAL visibility to allow this functionality to - // be used to pre-resolve dependent libraries of JNI code without - // requiring that all references to symbols in those libraries be - // looked up dynamically via the ProcAddressTable mechanism; in - // other words, one can actually link against the library instead of - // having to dlsym all entry points. System.loadLibrary() uses - // RTLD_LOCAL visibility so can't be used for this purpose. - SecurityUtil.checkLinkPermission(pathname); - return dlopen(pathname, RTLD_LAZY | RTLD_GLOBAL); - } - - public long lookupSymbol(long libraryHandle, String symbolName) { + public final long lookupSymbol(long libraryHandle, String symbolName) { final long addr = dlsym(libraryHandle, symbolName); if(DEBUG_LOOKUP) { System.err.println("DynamicLinkerImpl.lookupSymbol(0x"+Long.toHexString(libraryHandle)+", "+symbolName+") -> 0x"+Long.toHexString(addr)); @@ -60,19 +58,11 @@ public class UnixDynamicLinkerImpl implements DynamicLinker { return addr; } - public long lookupSymbolGlobal(String symbolName) { - final long addr = dlsym(RTLD_DEFAULT, symbolName); - if(DEBUG_LOOKUP) { - System.err.println("DynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr)); - } - return addr; - } - - public void closeLibrary(long libraryHandle) { + public final void closeLibrary(long libraryHandle) { dlclose(libraryHandle); } - public String getLastError() { + public final String getLastError() { return dlerror(); } } diff --git a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java index 884ac39..158bd7c 100644 --- a/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java +++ b/src/java/jogamp/common/os/WindowsDynamicLinkerImpl.java @@ -1,9 +1,36 @@ +/** + * Copyright 2013 JogAmp Community. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of JogAmp Community. + */ package jogamp.common.os; import com.jogamp.common.os.DynamicLinker; import com.jogamp.common.util.SecurityUtil; -public class WindowsDynamicLinkerImpl implements DynamicLinker { +public final class WindowsDynamicLinkerImpl implements DynamicLinker { /** Interface to C language function: <br> <code> BOOL FreeLibrary(HANDLE hLibModule); </code> */ private static native int FreeLibrary(long hLibModule); @@ -19,13 +46,13 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker { // --- Begin CustomJavaCode .cfg declarations - public long openLibraryLocal(String libraryName, boolean debug) throws SecurityException { + public final long openLibraryLocal(String libraryName, boolean debug) throws SecurityException { // How does that work under Windows ? // Don't know .. so it's an alias for the time being return openLibraryGlobal(libraryName, debug); } - public long openLibraryGlobal(String libraryName, boolean debug) throws SecurityException { + public final long openLibraryGlobal(String libraryName, boolean debug) throws SecurityException { SecurityUtil.checkLinkPermission(libraryName); long handle = LoadLibraryW(libraryName); if(0==handle && debug) { @@ -35,7 +62,7 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker { return handle; } - public long lookupSymbol(long libraryHandle, String symbolName) { + public final long lookupSymbol(long libraryHandle, String symbolName) { String _symbolName = symbolName; long addr = GetProcAddressA(libraryHandle, _symbolName); if(0==addr) { @@ -54,7 +81,7 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker { return addr; } - public long lookupSymbolGlobal(String symbolName) { + public final long lookupSymbolGlobal(String symbolName) { if(DEBUG_LOOKUP) { System.err.println("lookupSymbolGlobal: Not supported on Windows"); } @@ -62,11 +89,11 @@ public class WindowsDynamicLinkerImpl implements DynamicLinker { return 0; } - public void closeLibrary(long libraryHandle) { + public final void closeLibrary(long libraryHandle) { FreeLibrary(libraryHandle); } - public String getLastError() { + public final String getLastError() { final int err = GetLastError(); return "Last error: 0x"+Integer.toHexString(err)+" ("+err+")"; } |