Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / bindings / java / org / simgrid / NativeLib.java

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 6bd5dae..35527c0 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -8,6 +8,7 @@ package org.simgrid;
 
 import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.io.File;
 import java.nio.file.Files;
@@ -19,12 +20,11 @@ public final class NativeLib {
        public static void nativeInit() {
                if (isNativeInited)
                        return;
-               
+
                if (System.getProperty("os.name").toLowerCase().startsWith("win"))
                        NativeLib.nativeInit("winpthread-1");
 
                NativeLib.nativeInit("simgrid");
-               NativeLib.nativeInit("surf-java");
                NativeLib.nativeInit("simgrid-java");      
                isNativeInited = true;
        }
@@ -33,15 +33,29 @@ public final class NativeLib {
                try {
                        /* Prefer the version of the library bundled into the jar file and use it */
                        loadLib(name);
-               } catch (SimGridLibNotFoundException e) {
+               } catch (LinkageException embeededException) {
                        /* If not found, try to see if we can find a version on disk */
                        try {
                                System.loadLibrary(name);
-                       } catch (UnsatisfiedLinkError e2) {
-                               System.err.println("Cannot load the bindings to the "+name+" library in path "+getPath());
-                               e.printStackTrace();
-                               System.err.println("This jar file does not seem to fit your system, and I cannot find an installation of SimGrid.");
-                               System.exit(1);
+                       } catch (UnsatisfiedLinkError systemException) {
+                               if (! name.equals("boost_context")) { // Ignore when we cannot load boost_context
+                                       
+                                       System.err.println("\nCannot load the bindings to the "+name+" library in path "+getPath());
+                                       Throwable cause = embeededException.getCause();
+                                       if (cause instanceof java.lang.UnsatisfiedLinkError) {
+                                               if (cause.getMessage().matches(".*libcgraph.so.*"))
+                                                       System.err.println("HINT: Try to install the libcgraph package (sudo apt-get install libcgraph).");
+                                               else if (cause.getMessage().matches(".*libboost_context.so.*"))
+                                                       System.err.println("HINT: Try to install the boost-context package (sudo apt-get install libboost-context-dev).");
+                                               else
+                                                       System.err.println("Try to install the missing dependencies, which name should appear above.");                                                 
+                                       } else {
+                                               System.err.println("This jar file does not seem to fit your system, and no usable SimGrid installation found on disk.");
+                                       }
+                                       System.err.println();
+                                       cause.printStackTrace();
+                                       System.exit(1);
+                               }
                        }
                }
        }
@@ -70,7 +84,7 @@ public final class NativeLib {
                return prefix + "/" + os + "/" + arch + "/";
        }
        static Path tempDir = null;
-       private static void loadLib (String name) throws SimGridLibNotFoundException {
+       private static void loadLib (String name) throws LinkageException {
                String Path = NativeLib.getPath();
 
                String filename=name;
@@ -93,12 +107,12 @@ public final class NativeLib {
                        in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
                }
                if (in == null) {
-                       throw new SimGridLibNotFoundException("Cannot find library "+name+" in path "+Path+". Sorry, but this jar does not seem to be usable on your machine.");
+                       throw new LinkageException("Cannot find library "+name+" in path "+Path+". Sorry, but this jar does not seem to be usable on your machine.");
                }
                try {
                        // We must write the lib onto the disk before loading it -- stupid operating systems
                        if (tempDir == null) {
-                               tempDir = Files.createTempDirectory("simgrid-java");
+                               tempDir = Files.createTempDirectory("simgrid-java-");
                                // don't leak the files on disk, but remove it on JVM shutdown
                                Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(tempDir.toFile())));
                        }
@@ -115,10 +129,8 @@ public final class NativeLib {
                        in.close();
                        out.close();
                        System.load(fileOut.getAbsolutePath());
-               } catch (Exception e) {
-                       System.err.println("Error while extracting the native library from the jar: ");
-                       e.printStackTrace();
-                       throw new SimGridLibNotFoundException("Cannot load the bindings to the "+name+" library in path "+getPath(),   e);
+               } catch (SecurityException|UnsatisfiedLinkError|IOException e) {
+                       throw new LinkageException("Cannot load the bindings to the "+name+" library in path "+getPath(), e);
                }
        }
 
@@ -128,13 +140,16 @@ public final class NativeLib {
                public FileCleaner(File dir) {
                        this.dir = dir;
                }
+               @Override
                public void run() {
                        try {
-                           for (File f : dir.listFiles())
-                               f.delete();
-                               dir.delete();
+                               for (File f : dir.listFiles())
+                                       if (! f.delete() )
+                                               System.err.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
+                           if (! dir.delete() )
+                                       System.err.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");                                
                        } catch(Exception e) {
-                               System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");
+                               System.err.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause());
                                e.printStackTrace();
                        }
                }    
@@ -146,13 +161,13 @@ public final class NativeLib {
        }
 }
 
-class SimGridLibNotFoundException extends Exception {
+class LinkageException extends Exception {
        private static final long serialVersionUID = 1L;
-       public SimGridLibNotFoundException(String msg) {
+       public LinkageException(String msg) {
                super(msg);
        }
 
-       public SimGridLibNotFoundException(String msg, Exception e) {
+       public LinkageException(String msg, Throwable e) {
                super(msg,e);
        }
-}
\ No newline at end of file
+}