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;
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;
NativeLib.nativeInit("winpthread-1");
NativeLib.nativeInit("simgrid");
- NativeLib.nativeInit("simgrid-java");
+ NativeLib.nativeInit("simgrid-java");
isNativeInited = true;
}
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);
} catch (UnsatisfiedLinkError systemException) {
- if (! name.equals("boost_context")) { // Ignore when we cannot load boost_context
+ 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();
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.");
+ 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.");
}
if (arch.matches("^i[3-6]86$"))
arch = "x86";
- else if (arch.equalsIgnoreCase("x86_64"))
- arch = "amd64";
- else if (arch.equalsIgnoreCase("AMD64"))
+ else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
arch = "amd64";
if (os.toLowerCase().startsWith("win")){
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())));
}
/* 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 (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);
}
}
@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();
}
- }
+ }
}
}
}
-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
+}
