Properties controllers API and System Directory Library path

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestBasicFeatures.java

@@ -39,7 +39,7 @@
 import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
 import electrostatic4j.snaploader.platform.util.PlatformPredicate;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 import electrostatic4j.snaploader.LoadingCriterion;
 
 /**
@@ -92,7 +92,7 @@ protected static void printDetails(NativeBinaryLoader loader) {
     }
 
     protected static DirectoryPath getLibrariesAbsolutePath() {
-        return new DirectoryPath(PropertiesProvider.USER_DIR.getSystemProperty(), "libs");
+        return new DirectoryPath(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs");
     }
 
     protected static DirectoryPath getJarFilePath() {
@@ -101,7 +101,7 @@ protected static DirectoryPath getJarFilePath() {
 
     protected static String getNativeDynamicLibraryPath() {
         return getLibrariesAbsolutePath().getPath() +
-                    PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + 
+                    DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() +
                     "lib" + getLibraryBaseName() + ".so";
     }
 

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestBasicFeatures2.java

@@ -42,7 +42,7 @@
 import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
 import electrostatic4j.snaploader.platform.util.PlatformPredicate;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 import electrostatic4j.snaploader.LoadingCriterion;
 
 /**
@@ -55,8 +55,8 @@ public final class TestBasicFeatures2 {
 
     public static void main(String[] args) throws Exception {
 
-        final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
-        final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", 
+        final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
+        final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
                                                                       NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
 
         final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestFilesystemException.java

@@ -8,17 +8,16 @@
 import electrostatic4j.snaploader.platform.util.DefaultDynamicLibraries;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
 import electrostatic4j.snaploader.platform.util.PlatformPredicate;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public final class TestFilesystemException {
     public static void main(String[] args) throws Exception {
-        final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
-        final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs",
+        final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
+        final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
                 NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
 
         final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestFilesystemMemoryLeak.java

@@ -35,7 +35,7 @@
 import electrostatic4j.snaploader.filesystem.FileExtractionListener;
 import electrostatic4j.snaploader.filesystem.FileExtractor;
 import electrostatic4j.snaploader.filesystem.FileLocator;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 import electrostatic4j.snaploader.util.SnapLoaderLogger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -78,12 +78,12 @@ public void onExtractionFinalization(FileExtractor fileExtractor, FileLocator fi
 
     protected static String getZipAbsolutePath() {
         return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
-                PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
+                DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
     }
 
     protected static String getExtractionPath() {
         return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
-                PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
+                DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
     }
 
     protected static String getFilePath() {

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestNativeDllLoader.java

@@ -12,8 +12,8 @@ public final class TestNativeDllLoader {
     public static void main(String[] args) throws Exception {
         final NativeDynamicLibrary[] baseLibs = new NativeDynamicLibrary[] {
              DefaultDynamicLibraries.ANDROID_ALL,
-             new NativeDynamicLibrary("linux/x86-64/com/github/stephengoldd", PlatformPredicate.LINUX_X86_64),
-             new NativeDynamicLibrary("windows/x86-64/com/github/stephengoldd", PlatformPredicate.WIN_X86_64),
+             new NativeDynamicLibrary("linux/x86-64/com/github/stephengold", PlatformPredicate.LINUX_X86_64),
+             new NativeDynamicLibrary("windows/x86-64/com/github/stephengold", PlatformPredicate.WIN_X86_64),
         };
 
         final NativeDynamicLibrary[] cpuEnhancedLibs = new NativeDynamicLibrary[]{
@@ -24,7 +24,7 @@ public static void main(String[] args) throws Exception {
                                 "avx", "avx2", "sse4_1", "sse4_2")),
         };
         final LibraryInfo info = new LibraryInfo(new DirectoryPath("linux/x86-64/com/github/stephengold"),
-                            "joltjnid", DirectoryPath.USER_DIR);
+                            "joltjni", DirectoryPath.USER_DIR);
         final NativeDllLoader nativeDllLoader = new NativeDllLoader(baseLibs, cpuEnhancedLibs, info, true, true);
         nativeDllLoader.loadCpuEnhancedLibs(LoadingCriterion.INCREMENTAL_LOADING);
     }

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestRetryExhaustionException.java

@@ -43,7 +43,7 @@
 import electrostatic4j.snaploader.platform.util.DefaultDynamicLibraries;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
 import electrostatic4j.snaploader.platform.util.PlatformPredicate;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 
 /**
  * Tests retry exhaustion on a broken library.
@@ -53,8 +53,8 @@
 public class TestRetryExhaustionException {
     public static void main(String[] args) throws Exception {
 
-        final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", "corrupted-lib.jar");
-        final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs",
+        final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", "corrupted-lib.jar");
+        final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
                 NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
 
         final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestZipExtractor.java

@@ -35,7 +35,7 @@
 import electrostatic4j.snaploader.filesystem.FileExtractionListener;
 import electrostatic4j.snaploader.filesystem.FileExtractor;
 import electrostatic4j.snaploader.filesystem.FileLocator;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 import electrostatic4j.snaploader.throwable.FilesystemResourceScavengingException;
 
 import java.util.zip.ZipFile;
@@ -80,12 +80,12 @@ public void onExtractionFinalization(FileExtractor fileExtractor, FileLocator fi
 
     protected static String getZipAbsolutePath() {
         return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
-                PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
+                DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
     }
 
     protected static String getExtractionPath() {
         return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
-                PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
+                DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
     }
 
     protected static String getFilePath() {

snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/api/NativeDllLoader.java

@@ -348,4 +348,13 @@ protected void signalImminentFailure(CallingStackMetaData callingStackMetaData)
         // signal an imminent failure and crash the application
         Runtime.getRuntime().exit(-callingStackMetaData.getErrorCause().hashCode());
     }
+
+    /**
+     * Retrieves the associated native binary loader object.
+     *
+     * @return a native binary loader object that is associated wtih this object.
+     */
+    public NativeBinaryLoader getLoader() {
+        return loader;
+    }
 }

snaploader/src/main/java/electrostatic4j/snaploader/NativeBinaryLoader.java

@@ -32,7 +32,9 @@
 
 package electrostatic4j.snaploader;
 
+import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileSystems;
 import java.util.Arrays;
 import java.util.List;
 import java.util.jar.JarFile;
@@ -45,6 +47,8 @@
 import electrostatic4j.snaploader.library.LibraryLocator;
 import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
+import electrostatic4j.snaploader.platform.util.PropertiesControllerNamespace;
+import electrostatic4j.snaploader.platform.util.PropertiesController;
 import electrostatic4j.snaploader.throwable.LoadingRetryExhaustionException;
 import electrostatic4j.snaploader.throwable.UnSupportedSystemError;
 import electrostatic4j.snaploader.util.CallingStackMetaData;
@@ -89,11 +93,15 @@
 
     protected int numberOfLoadingFailure = 0;
 
+    private LoadingCriterion loadingCriterion; // cache the loading criterion for system controller use
+
     /**
      * Instantiates a native dynamic library loader to extract and load a system-specific native dynamic library.
      */
     public NativeBinaryLoader(final LibraryInfo libraryInfo) {
         this.libraryInfo = libraryInfo;
+        // initialize the system controller object
+        PropertiesControllerNamespace.systemDirectoryController.initialize();
     }
 
     /**
@@ -176,14 +184,17 @@
         }
         // commands and loads the library from the system directories
         if (NativeVariant.Os.isAndroid() || criterion == LoadingCriterion.SYSTEM_LOAD) {
-            loadSystemBinary();
+            loadSystemBinary(nativeDynamicLibrary);
+            loadingCriterion = LoadingCriterion.SYSTEM_LOAD;
             return this;
         }
         if (criterion == LoadingCriterion.INCREMENTAL_LOADING && nativeDynamicLibrary.isExtracted()) {
             loadBinary(nativeDynamicLibrary, criterion);
+            loadingCriterion = LoadingCriterion.INCREMENTAL_LOADING;
             return this;
         }
         cleanExtractBinary(nativeDynamicLibrary);
+        loadingCriterion = LoadingCriterion.CLEAN_EXTRACTION;
         return this;
     }
 
@@ -196,6 +207,10 @@
         return nativeDynamicLibrary;
     }
 
+    public PropertiesController getSystemDirectoryController() {
+        return PropertiesControllerNamespace.systemDirectoryController;
+    }
+
     /**
      * Enables the logging for this object, default value is false.
      *
@@ -271,12 +286,27 @@
     }
 
     /**
-     * Loads a native binary from the system directories into the process virtual
+     * Loads a native binary from the customized system directories into the process virtual
      * address space using the library basename in a platform-dependent way.
      */
-    protected void loadSystemBinary() {
+    protected void loadSystemBinary(NativeDynamicLibrary dynamicLibrary) {
+        SnapLoaderLogger.log(Level.INFO, getClass().getName(), "loadSystemBinary", "Loading library from the system: "
+                    + Arrays.toString(PropertiesControllerNamespace.systemDirectoryController.toList()));
         try {
-            System.loadLibrary(libraryInfo.getBaseName());
+            // use custom system directories for desktop ONLY!
+            if (NativeVariant.Os.isDesktop()) {
+                PropertiesControllerNamespace.systemDirectoryController.iterate(path -> {
+                    final File lib = new File(FileSystems.getDefault()
+                            .getPath(path.toString(),
+                                    dynamicLibrary.getLibraryFile()).toString());
+                    if (lib.exists()) {
+                        System.load(lib.getAbsolutePath());
+                    }
+                    return "";
+                });
+            } else {
+                System.loadLibrary(libraryInfo.getBaseName());
+            }
             SnapLoaderLogger.log(Level.INFO, getClass().getName(), "loadSystemBinary", "Successfully loaded library from the system: "
                     + libraryInfo.getBaseName());
             if (nativeBinaryLoadingListener != null) {

snaploader/src/main/java/electrostatic4j/snaploader/filesystem/DirectoryPath.java

@@ -32,7 +32,7 @@
 
 package electrostatic4j.snaploader.filesystem;
 
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 
 /**
  * A class denotes and provides a directory absolute path.
@@ -45,13 +45,13 @@ public final class DirectoryPath {
      * An alias object for the current working directory absolute path.
      */
     public static final DirectoryPath USER_DIR =
-            new DirectoryPath(PropertiesProvider.USER_DIR.getSystemProperty());
+            new DirectoryPath(DefaultPropertiesProvider.USER_DIR.getSystemProperty());
 
     /**
      * An alias object for the root user home directory absolute path.
      */
     public static final DirectoryPath USER_HOME =
-            new DirectoryPath(PropertiesProvider.USER_HOME.getSystemProperty());
+            new DirectoryPath(DefaultPropertiesProvider.USER_HOME.getSystemProperty());
 
     /**
      * When combined with the
@@ -85,7 +85,7 @@ public DirectoryPath(final String root, final String... entries) {
             if (entry == null) {
                 continue;
             }
-            path = getPath() + PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + entry;
+            path = getPath() + DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + entry;
         }
     }
 

snaploader/src/main/java/electrostatic4j/snaploader/platform/NativeDynamicLibrary.java

@@ -38,7 +38,7 @@
 import electrostatic4j.snaploader.filesystem.DirectoryPath;
 import electrostatic4j.snaploader.platform.util.NativeVariant;
 import electrostatic4j.snaploader.platform.util.PlatformPredicate;
-import electrostatic4j.snaploader.platform.util.PropertiesProvider;
+import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
 
 /**
  * Represents a filesystem to a platform-specific binary inside
@@ -170,7 +170,7 @@ public String getPlatformDirectory() {
      * @return a string representing the library path within the jar compression
      */
     public String getCompressedLibrary() {
-        return platformDirectory + PropertiesProvider.ZIP_FILE_SEPARATOR.getSystemProperty() + libraryFile;
+        return platformDirectory + DefaultPropertiesProvider.ZIP_FILE_SEPARATOR.getSystemProperty() + libraryFile;
     }
 
     /**
@@ -180,7 +180,11 @@ public String getCompressedLibrary() {
      */
     public String getExtractedLibrary() {
         return directoryPath.getPath()
-                + PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + libraryFile;
+                + DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + libraryFile;
+    }
+
+    public String getLibraryFile() {
+        return libraryFile;
     }
 
     /**