andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Share code that is needed to support shaded native libraries.

Browse Source 
Motivation:

For our native libraries in netty we support shading, to have this work on runtime the user needs to set a system property. This code should shared.

Modifications:

Move logic to NativeLbiraryLoader and so share for all native libs.

Result:

Less code duplication and also will work for netty-tcnative out of the box once it support shading
This commit is contained in:
Norman Maurer 2017-05-19 09:14:52 +02:00
parent 915bf5f5b7
commit 201d9b6536
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/io/netty/util/internal/NativeLibraryLoader.java
View File

@ -181,7 +181,10 @@ public final class NativeLibraryLoader {
/** /**
* Load the given library with the specified {@link ClassLoader} * Load the given library with the specified {@link ClassLoader}
*/ */
public static void load(String name, ClassLoader loader) { public static void load(String originalName, ClassLoader loader) {
// Adjust expected name to support shading of native libraries.
String name = SystemPropertyUtil.get("io.netty.packagePrefix", "").replace('.', '-') + originalName;
String libname = System.mapLibraryName(name); String libname = System.mapLibraryName(name);
String path = NATIVE_RESOURCE_HOME + libname; String path = NATIVE_RESOURCE_HOME + libname;

3
transport-native-epoll/src/main/java/io/netty/channel/epoll/Native.java
View File

@ -188,8 +188,7 @@ public final class Native {
if (!name.startsWith("linux")) { if (!name.startsWith("linux")) {
throw new IllegalStateException("Only supported on Linux"); throw new IllegalStateException("Only supported on Linux");
} }
NativeLibraryLoader.load(SystemPropertyUtil.get("io.netty.packagePrefix", "").replace('.', '-') + NativeLibraryLoader.load("netty-transport-native-epoll", PlatformDependent.getClassLoader(Native.class));
"netty-transport-native-epoll", PlatformDependent.getClassLoader(Native.class));
} }
private Native() { private Native() {

3
transport-native-kqueue/src/main/java/io/netty/channel/kqueue/Native.java
View File

@ -100,8 +100,7 @@ final class Native {
if (!name.startsWith("mac") && !name.contains("bsd") && !name.startsWith("darwin")) { if (!name.startsWith("mac") && !name.contains("bsd") && !name.startsWith("darwin")) {
throw new IllegalStateException("Only supported on BSD"); throw new IllegalStateException("Only supported on BSD");
} }
NativeLibraryLoader.load(SystemPropertyUtil.get("io.netty.packagePrefix", "").replace('.', '-') + NativeLibraryLoader.load("netty-transport-native-kqueue", PlatformDependent.getClassLoader(Native.class));
"netty-transport-native-kqueue", PlatformDependent.getClassLoader(Native.class));
} }
private Native() { private Native() {