X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d000a773b5ebcd411b28c31de68eeddf804e66b..43d9c42c766d4bbe9667bec4ee832242e4f22e0b:/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 c89c57f4ed..150b0cc9e6 100644
--- 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;
@@ -15,7 +16,13 @@ import java.nio.file.Path;
 
 public final class NativeLib {
 	/* Statically load the library which contains all native functions used in here */
-	static private boolean isNativeInited = false;
+	private static boolean isNativeInited = false;
+	static Path tempDir = null;
+
+	private NativeLib() {
+		throw new IllegalAccessError("Utility class");
+	}
+
 	public static void nativeInit() {
 		if (isNativeInited)
 			return;
@@ -24,7 +31,7 @@ public final class NativeLib {
 			NativeLib.nativeInit("winpthread-1");
 
 		NativeLib.nativeInit("simgrid");
-		NativeLib.nativeInit("simgrid-java");      
+		NativeLib.nativeInit("simgrid-java");
 		isNativeInited = true;
 	}
 
@@ -32,15 +39,27 @@ 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) {
-				if (! name.equals("boost_context")) {
-					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.");
+			} catch (UnsatisfiedLinkError systemException) {
+				if (! "boost_context".equals(name)) { // 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);
 				}
 			}
@@ -55,9 +74,9 @@ public final class NativeLib {
 
 		if (arch.matches("^i[3-6]86$"))
 			arch = "x86";
-		else if (arch.equalsIgnoreCase("x86_64"))
+		else if ("x86_64".equalsIgnoreCase(arch))
 			arch = "amd64";
-		else if (arch.equalsIgnoreCase("AMD64"))
+		else if ("AMD64".equalsIgnoreCase(arch))
 			arch = "amd64";
 
 		if (os.toLowerCase().startsWith("win")){
@@ -70,36 +89,36 @@ public final class NativeLib {
 
 		return prefix + "/" + os + "/" + arch + "/";
 	}
-	static Path tempDir = null;
-	private static void loadLib (String name) throws SimGridLibNotFoundException {
-		String Path = NativeLib.getPath();
+
+	private static void loadLib (String name) throws LinkageException {
+		String path = NativeLib.getPath();
 
 		String filename=name;
-		InputStream in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+		InputStream in = NativeLib.class.getClassLoader().getResourceAsStream(path+filename);
 
 		if (in == null) {
 			filename = "lib"+name+".so";
-			in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+			in = NativeLib.class.getClassLoader().getResourceAsStream(path+filename);
 		}
 		if (in == null) {
 			filename = name+".dll";
-			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+			in =  NativeLib.class.getClassLoader().getResourceAsStream(path+filename);
 		}
 		if (in == null) {
 			filename = "lib"+name+".dll";
-			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+			in =  NativeLib.class.getClassLoader().getResourceAsStream(path+filename);
 		}
 		if (in == null) {
 			filename = "lib"+name+".dylib";
-			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+			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())));
 			}
@@ -108,18 +127,16 @@ public final class NativeLib {
 			/* copy the library in position */  
 			OutputStream out = new FileOutputStream(fileOut);
 			byte[] buffer = new byte[4096]; 
-			int bytes_read; 
-			while ((bytes_read = in.read(buffer)) != -1)     // Read until EOF
-				out.write(buffer, 0, bytes_read); 
+			int bytesRead; 
+			while ((bytesRead = in.read(buffer)) != -1)     // Read until EOF
+				out.write(buffer, 0, bytesRead); 
 
 			/* close all file descriptors, and load that shit */
 			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);
 		}
 	}
 
@@ -129,16 +146,19 @@ 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();
 			}
-		}    
+		}
 	}
 
 
@@ -147,13 +167,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
+}