From 64acda35b83bda6e4b2f7ea9268b0246c9e909c5 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 29 Nov 2014 11:56:42 +0100 Subject: [PATCH] reindent and improve displayed message --- src/bindings/java/org/simgrid/NativeLib.java | 184 +++++++++---------- src/bindings/java/org/simgrid/msg/Msg.java | 41 ++--- 2 files changed, 112 insertions(+), 113 deletions(-) diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java index 18e593a14d..cdeb4b6bd2 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -13,107 +13,107 @@ 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 + "/"; } - 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); + 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."); + } + 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 in path "+getPath()); + e.printStackTrace(); + System.err.println("This jar file does not seem to fit your system, sorry"); + System.exit(1); + } } - } - + /* 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) { + System.out.println("This java library will try to load the native code under the following name:" +getPath()); + } } diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java index ec212a7d8e..6cdc8944e1 100644 --- a/src/bindings/java/org/simgrid/msg/Msg.java +++ b/src/bindings/java/org/simgrid/msg/Msg.java @@ -18,22 +18,21 @@ import java.io.File; public final class Msg { /* Statically load the library which contains all native functions used in here */ static private boolean isNativeInited = false; - public static void nativeInit() { - if (isNativeInited) - return; - NativeLib.nativeInit("simgrid"); - NativeLib.nativeInit("simgrid-java"); + public static void nativeInit() { + if (isNativeInited) + return; + NativeLib.nativeInit("simgrid"); + NativeLib.nativeInit("simgrid-java"); isNativeInited = true; - } static { - nativeInit(); + nativeInit(); } - - /** Retrieve the simulation time - * @return The simulation time. - */ + + /** Retrieve the simulation time + * @return The simulation time. + */ public final static native double getClock(); /** * Issue a debug logging message. @@ -47,8 +46,8 @@ public final class Msg { public final static native void verb(String s); /** Issue an information logging message - * @param s - */ + * @param s + */ public final static native void info(String s); /** * Issue an warning logging message. @@ -86,7 +85,7 @@ public final class Msg { * of a process or the current date is perfectly ok. */ public final static native void run() ; - + /** This function is useless nowadays, just stop calling it. */ @Deprecated public final static void clean(){} @@ -104,15 +103,15 @@ public final class Msg { /** * The method to deploy the simulation. * - * - * @param deploymentFile - */ + * + * @param deploymentFile + */ public final static native void deployApplication(String deploymentFile); - /** Example launcher. You can use it or provide your own launcher, as you wish - * @param args - * @throws MsgException - */ + /** Example launcher. You can use it or provide your own launcher, as you wish + * @param args + * @throws MsgException + */ static public void main(String[]args) throws MsgException { /* initialize the MSG simulation. Must be done before anything else (even logging). */ Msg.init(args); -- 2.20.1