do not catch Throwable

[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 de5d17c..7865f1c 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;
@@ -32,7 +33,7 @@ public final class NativeLib {
                try {
                        /* Prefer the version of the library bundled into the jar file and use it */
                        loadLib(name);
-               } catch (SimGridLibNotFoundException embeededException) {
+               } catch (LinkageException embeededException) {
                        /* If not found, try to see if we can find a version on disk */
                        try {
                                System.loadLibrary(name);
@@ -41,10 +42,16 @@ public final class NativeLib {
                                        
                                        System.err.println("\nCannot load the bindings to the "+name+" library in path "+getPath());
                                        Throwable cause = embeededException.getCause();
-                                       if (cause instanceof java.lang.UnsatisfiedLinkError && cause.getMessage().matches(".*libcgraph.so.*"))
-                                               System.err.println("HINT: Try to install the libcgraph package (sudo apt-get install libcgraph).");
-                                       else
+                                       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);
@@ -77,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;
@@ -100,7 +107,7 @@ 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
@@ -122,8 +129,8 @@ public final class NativeLib {
                        in.close();
                        out.close();
                        System.load(fileOut.getAbsolutePath());
-               } catch (Throwable e) {
-                       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);
                }
        }
 
@@ -152,13 +159,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, Throwable e) {
+       public LinkageException(String msg, Throwable e) {
                super(msg,e);
        }
-}
\ No newline at end of file
+}