tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-07-17 11:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Discard the local JNI code loader and the org.xerial.snappy.disable.inject option

Browse Source
This commit is contained in:
Taro L. Saito 2011-08-02 15:07:59 +09:00
parent f0ef649651
commit aa04d562f8
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/xerial/snappy/SnappyLoader.java
View File

@ -86,7 +86,6 @@ public class SnappyLoader
public static final String KEY_SNAPPY_LIB_NAME = "org.xerial.snappy.lib.name"; public static final String KEY_SNAPPY_LIB_NAME = "org.xerial.snappy.lib.name";
public static final String KEY_SNAPPY_TEMPDIR = "org.xerial.snappy.tempdir"; public static final String KEY_SNAPPY_TEMPDIR = "org.xerial.snappy.tempdir";
public static final String KEY_SNAPPY_DISABLE_BUNDLED_LIBS = "org.xerial.snappy.disable.bundled.libs"; public static final String KEY_SNAPPY_DISABLE_BUNDLED_LIBS = "org.xerial.snappy.disable.bundled.libs";
public static final String KEY_SNAPPY_DISABLE_NATIVE_INJECTION = "org.xerial.snappy.disable.inject";
private static boolean isLoaded = false; private static boolean isLoaded = false;
private static SnappyNativeAPI api = null; private static SnappyNativeAPI api = null;
@ -97,7 +96,6 @@ public class SnappyLoader
cl = cl.getParent(); cl = cl.getParent();
} }
return cl; return cl;
//return ClassLoader.getSystemClassLoader();
} }
private static byte[] getByteCode(String resourcePath) throws IOException { private static byte[] getByteCode(String resourcePath) throws IOException {
@ -166,37 +164,18 @@ public class SnappyLoader
* *
* @return * @return
*/ */
static SnappyNativeAPI load() { static synchronized SnappyNativeAPI load() {
if (api != null) if (api != null)
return api; return api;
boolean useNativeCodeInjection = !Boolean.parseBoolean(System.getProperty(KEY_SNAPPY_DISABLE_NATIVE_INJECTION,
"false"));
//System.out.println("use native code injection: " + useNativeCodeInjection);
try { try {
if (useNativeCodeInjection) {
if (!hasInjectedNativeLoader()) { if (!hasInjectedNativeLoader()) {
// Prepare SnappyNativeLoader or LocalSnappyNativeLoader // Prepare SnappyNativeLoader or LocalSnappyNativeLoader
Class< ? > nativeLoader = injectSnappyNativeLoader(); Class< ? > nativeLoader = injectSnappyNativeLoader();
// Load the JNI code // Load the JNI code
loadNativeLibrary(nativeLoader); loadNativeLibrary(nativeLoader);
} }
}
else {
if (!isLoaded) {
// load locally
File nativeLib = findNativeLibrary();
if (nativeLib != null) {
System.load(nativeLib.getAbsolutePath());
}
else {
// Load pre-installed libsnappyjava (in the path -Djava.library.path)
System.loadLibrary("snappyjava");
}
}
}
isLoaded = true; isLoaded = true;
api = (SnappyNativeAPI) Class.forName("org.xerial.snappy.SnappyNative").newInstance(); api = (SnappyNativeAPI) Class.forName("org.xerial.snappy.SnappyNative").newInstance();