Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NativeBinaryLoader: refactor autoLoad to enabled #63

Merged
merged 2 commits into from
Mar 26, 2023
Merged

NativeBinaryLoader: refactor autoLoad to enabled #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d22b61
NativeBinaryLoader: refactor `autoLoad` to `enabled`
pavly-gerges Mar 26, 2023
37be883
TestDisableAutoLoad: refactor `setAutoLoad` to `setEnabled`
pavly-gerges Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jme3-alloc-examples/src/main/java/com/jme3/alloc/examples/TestDisableAutoLoad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public final class TestDisableAutoLoad {

static {
/* disable binary auto-loading */
NativeBinaryLoader.setAutoLoad(false);
NativeBinaryLoader.setEnabled(false);
/* add your custom loader here! */
}

Expand Down
25 changes: 11 additions & 14 deletions jme3-alloc/src/main/java/com/jme3/alloc/util/loader/NativeBinaryLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import java.lang.UnsatisfiedLinkError;
import com.jme3.alloc.util.NativeBufferUtils;
import com.jme3.alloc.util.NativeErrno;

/**
* Helper utility for loading native binaries.
Expand All @@ -52,17 +50,17 @@ public final class NativeBinaryLoader {
private static final Logger LOGGER = Logger.getLogger(NativeBinaryLoader.class.getName());
private static final ReentrantLock LOCK = new ReentrantLock();
private static final int EOF = -1;
private static boolean autoLoad = true;
private static boolean enabled = true;

private NativeBinaryLoader() {
}

/**
* Extracts and loads the variant specific binary from the output jar, handling the error messages,
* guarded by the {@link NativeBinaryLoader#isAutoLoad()}.
* guarded by the {@link NativeBinaryLoader#isEnabled()}.
*/
public static void loadLibraryIfEnabled() {
if (!NativeBinaryLoader.isAutoLoad()) {
if (!NativeBinaryLoader.isEnabled()) {
LOGGER.log(Level.WARNING, "Stock Jme3-alloc-NativeBinaryLoader is not enabled!");
return;
}
Expand Down Expand Up @@ -92,26 +90,25 @@ public static void loadLibrary() throws IOException {
}

/**
* Adjusts the {@link NativeBinaryLoader#autoLoad} flag to enable/disable auto-extracting and dynamic loading.
* Adjusts the {@link NativeBinaryLoader#enabled} flag to enable/disable the {@link NativeBinaryLoader#loadLibraryIfEnabled()}.
* Default value is [true].
*
* @param isAutoLoad true to auto-extract and load the native binary dynamically, false otherwise.
* @param enabled true to enable the {@link NativeBinaryLoader#loadLibraryIfEnabled()}, false otherwise.
* @see NativeBinaryLoader#loadLibraryIfEnabled()
*/
public static void setAutoLoad(boolean isAutoLoad) {
NativeBinaryLoader.autoLoad = isAutoLoad;
public static void setEnabled(boolean enabled) {
NativeBinaryLoader.enabled = enabled;
}

/**
* Tests whether the native-binary will be auto-extracted and loaded when the
* class initializer of {@link NativeBufferUtils} or {@link NativeErrno} is called.
* Tests whether the method {@link NativeBinaryLoader#loadLibraryIfEnabled()} can load the native binary.
* Default value is [true].
*
* @return true if the native-binary is to be auto-extracted and loaded dynamically, false otherwise.
* @return true if the method {@link NativeBinaryLoader#loadLibraryIfEnabled()} is enabled to load the native binary.
* @see NativeBinaryLoader#loadLibraryIfEnabled()
*/
public static boolean isAutoLoad() {
return autoLoad;
public static boolean isEnabled() {
return enabled;
}

/**
Expand Down