From 72f60a534db7c0b731d4dca83481679817ad7574 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 25 Jun 2013 09:04:16 +0200
Subject: UnixDynamicLinkerImpl: Unify impl. of openLibraryLocal(..),
 openLibraryGlobal(..) and lookupSymbolGlobal(..) - removing duplicate code.

---
 .../jogamp/common/os/PosixDynamicLinkerImpl.java   | 41 ++--------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

(limited to 'src/java/jogamp/common/os/PosixDynamicLinkerImpl.java')

diff --git a/src/java/jogamp/common/os/PosixDynamicLinkerImpl.java b/src/java/jogamp/common/os/PosixDynamicLinkerImpl.java
index 50feb94..fced97f 100644
--- a/src/java/jogamp/common/os/PosixDynamicLinkerImpl.java
+++ b/src/java/jogamp/common/os/PosixDynamicLinkerImpl.java
@@ -27,8 +27,6 @@
  */
 package jogamp.common.os;
 
-import com.jogamp.common.util.SecurityUtil;
-
 public final class PosixDynamicLinkerImpl extends UnixDynamicLinkerImpl {
 
   private static final long RTLD_DEFAULT = 0;
@@ -41,49 +39,16 @@ public final class PosixDynamicLinkerImpl extends UnixDynamicLinkerImpl {
 
   @Override
   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
-    // 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);
-    final long handle = dlopen(pathname, RTLD_LAZY | RTLD_LOCAL);
-    if( 0 != handle ) {
-        incrLibRefCount(handle, pathname);
-    } else if ( DEBUG || debug ) {
-        System.err.println("dlopen \""+pathname+"\" local failed, error: "+dlerror());
-    }
-    return handle;
+    return this.openLibraryImpl(pathname, RTLD_LAZY | RTLD_LOCAL, debug);
   }
 
   @Override
   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
-    // 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);
-    final long handle = dlopen(pathname, RTLD_LAZY | RTLD_GLOBAL);
-    if( 0 != handle ) {
-        incrLibRefCount(handle, pathname);
-    } else if ( DEBUG || debug ) {
-        System.err.println("dlopen \""+pathname+"\" global failed, error: "+dlerror());
-    }
-    return handle;
+    return this.openLibraryImpl(pathname, RTLD_LAZY | RTLD_GLOBAL, debug);
   }
   
   @Override
   public final long lookupSymbolGlobal(String symbolName) throws SecurityException {
-    SecurityUtil.checkAllLinkPermission();
-    final long addr = dlsym(RTLD_DEFAULT, symbolName);
-    if(DEBUG_LOOKUP) {
-        System.err.println("DynamicLinkerImpl.lookupSymbolGlobal("+symbolName+") -> 0x"+Long.toHexString(addr));
-    }
-    return addr;    
+    return this.lookupSymbolGlobalImpl(RTLD_DEFAULT, symbolName);
   }
 }
-- 
cgit v1.2.3