X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7897fb8815dbff65907f646efb6f3ccf024e5481..9dbeb2372ad9a123d0558132ebb6e003e10aa641:/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 18e593a14d..82c5c12e3f 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -13,107 +13,126 @@ import java.io.File;
 
 public final class NativeLib {
 
-    public static String getPath() {
-        String prefix = "NATIVE";
-        String os = System.getProperty("os.name");
-        String arch = System.getProperty("os.arch");
-
-        if (arch.matches("^i[3-6]86$"))
-            arch = "x86";
-        else if (arch.equalsIgnoreCase("amd64"))
-            arch = "x86_64";
-
-        if (os.toLowerCase().startsWith("win")){
-            os = "Windows";
-            arch = "x86";
-        }else if (os.contains("OS X"))
-            os = "Darwin";
-
-        os = os.replace(' ', '_');
-        arch = arch.replace(' ', '_');
-
-        return prefix + "/" + os + "/" + arch + "/";
-    }
-    public static void nativeInit(String name) {
-        try {
-            /* prefer the version on disk, if existing */
-            System.loadLibrary(name);
-        } catch (UnsatisfiedLinkError e) {
-            /* If not found, unpack the one bundled into the jar file and use it */
-            loadLib(name);
-        }
-    }
-
-    private static void loadLib (String name) {
-        String Path = NativeLib.getPath();
-
-        String filename=name;
-        InputStream in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-		
-        if (in == null) {
-	    filename = "lib"+name+".so";
-            in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-        } 
-	if (in == null) {
-	    filename = name+".dll";
-	    in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-	}  
-	if (in == null) {
-	    filename = "lib"+name+".dll";
-	    in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-	}  
-	if (in == null) {
-	    filename = "lib"+name+".dylib";
-	    in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
-	}  
-	if (in == null) {
-	    throw new RuntimeException("Cannot find library "+name+" in path "+Path+". Sorry, but this jar does not seem to be usable on your machine.");
+	public static String getPath() {
+		String prefix = "NATIVE";
+		String os = System.getProperty("os.name");
+		String arch = System.getProperty("os.arch");
+
+		if (arch.matches("^i[3-6]86$"))
+			arch = "x86";
+		else if (arch.equalsIgnoreCase("amd64"))
+			arch = "x86_64";
+
+		if (os.toLowerCase().startsWith("win")){
+			os = "Windows";
+			arch = "x86";
+		}else if (os.contains("OS X"))
+			os = "Darwin";
+
+		os = os.replace(' ', '_');
+		arch = arch.replace(' ', '_');
+
+		return prefix + "/" + os + "/" + arch + "/";
+	}
+	public static void nativeInit(String name) {
+		try {
+			/* Prefer the version of the library bundled into the jar file and use it */
+			loadLib(name);
+		} catch (SimGridLibNotFoundException e) {
+			/* 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);
+			}
+		}
 	}
-	try {
-	    // We must write the lib onto the disk before loading it -- stupid operating systems
-	    File fileOut = new File(filename);
-	    fileOut = File.createTempFile(name+"-", ".tmp");
-	    // don't leak the file on disk, but remove it on JVM shutdown
-	    Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(fileOut.getAbsolutePath())));
-	    OutputStream out = new FileOutputStream(fileOut);
-			
-	    /* copy the library in position */  
-	    byte[] buffer = new byte[4096]; 
-	    int bytes_read; 
-	    while ((bytes_read = in.read(buffer)) != -1)     // Read until EOF
-		    out.write(buffer, 0, bytes_read); 
-		      
-	    /* close all file descriptors, and load that shit */
-	    in.close();
-	    out.close();
-	    System.load(fileOut.getAbsolutePath());
-
-	} catch (Exception e) {
-	    System.err.println("Cannot load the bindings to the "+name+" library: ");
-	    e.printStackTrace();
-	    System.err.println("This jar file does not seem to fit your system, sorry");
-	    System.exit(1);
+
+	private static void loadLib (String name) throws SimGridLibNotFoundException {
+		String Path = NativeLib.getPath();
+
+		String filename=name;
+		InputStream in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+
+		if (in == null) {
+			filename = "lib"+name+".so";
+			in = NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+		} 
+		if (in == null) {
+			filename = name+".dll";
+			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+		}  
+		if (in == null) {
+			filename = "lib"+name+".dll";
+			in =  NativeLib.class.getClassLoader().getResourceAsStream(Path+filename);
+		}  
+		if (in == null) {
+			filename = "lib"+name+".dylib";
+			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.");
+		}
+		try {
+			// We must write the lib onto the disk before loading it -- stupid operating systems
+			File fileOut = new File(filename);
+			fileOut = File.createTempFile(name+"-", ".tmp");
+			// don't leak the file on disk, but remove it on JVM shutdown
+			Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(fileOut.getAbsolutePath())));
+			OutputStream out = new FileOutputStream(fileOut);
+
+			/* copy the library in position */  
+			byte[] buffer = new byte[4096]; 
+			int bytes_read; 
+			while ((bytes_read = in.read(buffer)) != -1)     // Read until EOF
+				out.write(buffer, 0, bytes_read); 
+
+			/* close all file descriptors, and load that shit */
+			in.close();
+			out.close();
+			System.load(fileOut.getAbsolutePath());
+
+		} catch (Exception e) {
+			throw new SimGridLibNotFoundException("Cannot load the bindings to the "+name+" library in path "+getPath(),   e);
+		}
 	}
-    }
-    
+
 	/* A hackish mechanism used to remove the file containing our library when the JVM shuts down */
 	private static class FileCleaner implements Runnable {
 		private String target;
 		public FileCleaner(String name) {
 			target = name;
 		}
-        public void run() {
-            try {
-                new File(target).delete();
-            } catch(Exception e) {
-                System.out.println("Unable to clean temporary file "+target+" during shutdown.");
-                e.printStackTrace();
-            }
-        }    
+		public void run() {
+			try {
+				new File(target).delete();
+			} catch(Exception e) {
+				System.out.println("Unable to clean temporary file "+target+" during shutdown.");
+				e.printStackTrace();
+			}
+		}    
 	}
 
 
-    public static void main(String[] args) {
-        System.out.println(getPath());
-    }
+	public static void main(String[] args) {
+		if (args.length >= 1 && args[0].equals("--quiet"))
+			/* be careful, this execution path is used in buildtools/Cmake/Scripts/java_bundle.sh to determine where to put the libs */
+			System.out.println(getPath());
+		else 
+			System.out.println("This java library will try to load the native code under the following name:\n" +getPath());
+	}
 }
+
+class SimGridLibNotFoundException extends Exception {
+	private static final long serialVersionUID = 1L;
+	public SimGridLibNotFoundException(String msg) {
+		super(msg);
+	}
+
+	public SimGridLibNotFoundException(String msg, Exception e) {
+		super(msg,e);
+	}
+}
\ No newline at end of file