Added more detail about where libraries are loaded from to DumpInfo.

Author: mwcw

jostle/src/main/java/org/openssl/jostle/Loader.java

@@ -88,6 +88,7 @@ public class Loader
     private static List<String> loadedLibs = new ArrayList<>();
     private static boolean extractOpenSSL = true;
     private static boolean fixedInstallDir = false;
+    private static String installDir;
 
     public static void load()
     {
@@ -123,11 +124,11 @@ private static void loadImpl()
         extractOpenSSL = Properties.isOverrideSet(OPENSSL_EXTRACT, true);
         interfaceResolutionStrategy = Strings.toLowerCase(Properties.getPropertyValue(LOADER_INTERFACE, "auto"));
 
-        String libDir = Properties.getPropertyValue(LIB_INSTALL_DIR);
-        if (libDir == null)
+        installDir = Properties.getPropertyValue(LIB_INSTALL_DIR);
+        if (installDir == null)
         {
             L.fine(String.format("%s is not set so using java.io.tmpdir property", LIB_INSTALL_DIR));
-            libDir = Properties.getPropertyValue("java.io.tmpdir");
+            installDir = Properties.getPropertyValue("java.io.tmpdir");
         } else
         {
             fixedInstallDir = true;
@@ -136,7 +137,7 @@ private static void loadImpl()
         //
         // Unable to resolve a temporary directory root!
         //
-        if (libDir == null)
+        if (installDir == null)
         {
             throw new IOException("Unable to resolve a temporary directory");
         }
@@ -282,7 +283,7 @@ private static void loadImpl()
             {
                 String version = JostleProvider.INFO.substring(JostleProvider.INFO.lastIndexOf('v') + 1);
 
-                installRootDir = LoaderUtils.createVersionedTempDir(libDir, version);
+                installRootDir = LoaderUtils.createVersionedTempDir(installDir, version);
             } else
             {
                 installRootDir = LoaderUtils.createTempDir("jostle");
@@ -383,7 +384,8 @@ private static void extractAndLoad(File installRootDir, String libRootInJar, Ext
             throws Exception
     {
         String pathInJar = libRootInJar + "/" + extraction.name;
-        File libFile = LoaderUtils.extractFromClasspath(installRootDir, pathInJar, extraction.name);
+        String[] sources = new String[2];
+        File libFile = LoaderUtils.extractFromClasspath(installRootDir, pathInJar, extraction.name, sources);
         if (libFile == null)
         {
             throw new IOException(String.format("extraction file '%s' not found", pathInJar));
@@ -392,7 +394,16 @@ private static void extractAndLoad(File installRootDir, String libRootInJar, Ext
             L.fine(String.format("Wrote %s to %s, %d bytes", extraction.name, libFile.getAbsoluteFile(), libFile.length()));
         }
         System.load(libFile.getAbsolutePath());
-        loadedLibs.add("Extracted: " + pathInJar);
+
+
+        if (sources[0] != null && sources[1] != null)
+        {
+            loadedLibs.add("Loaded: " + sources[1]);
+            loadedLibs.add("  Compared to: " + sources[0]);
+        } else
+        {
+            loadedLibs.add("Extracted: " + sources[0]);
+        }
     }
 
     /**
@@ -463,6 +474,15 @@ public static boolean isFFI()
         return Extractions.Type.FFI == interfaceType;
     }
 
+    public static String getInstallDir()
+    {
+        return installDir;
+    }
+
+    public static boolean isFixedInstallDir() {
+        return fixedInstallDir;
+    }
+
     private static class Extractions
     {
 

jostle/src/main/java/org/openssl/jostle/LoaderUtils.java

@@ -189,13 +189,14 @@ public File run()
         }
     }
 
-    static File extractFromClasspath(File tmpDir, String pathInJar, String name)
+    static File extractFromClasspath(File tmpDir, String pathInJar, String name, String[] sources)
         throws Exception
     {
         return AccessController.doPrivileged(new PrivilegedAction<File>()
         {
             public File run()
             {
+                sources[0] = pathInJar;
                 InputStream in = Loader.class.getResourceAsStream(pathInJar);
                 if (in == null)
                 {
@@ -218,6 +219,7 @@ public File run()
                     {
                         if (isContentSame(fin, in))
                         {
+                            sources[1] = savedFile.getAbsolutePath();
                             return savedFile;
                         }
 

jostle/src/main/java/org/openssl/jostle/util/DumpInfo.java

@@ -57,6 +57,13 @@ public static void main(String[] args) throws Exception
         System.out.println("  Loader Message: " + Loader.getMessage());
         System.out.println("  Loader Interface Resolution Strategy: " + Loader.getInterfaceResolutionStrategy());
         System.out.println("  Loader Interface: " + Loader.getInterfaceTypeName());
+
+        if (Loader.isFixedInstallDir()) {
+            System.out.println("  Using Fixed Install Dir: "+Loader.getInstallDir());
+        } else {
+            System.out.println("  Using Install Dir: "+Loader.getInstallDir());
+        }
+        
         System.out.println("  Loaded Native Libraries:");
         Loader.getLoadedLibs().forEach(it -> {
             System.out.println("    " + it);