X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/666a812d1b3ee4568f2beb317dfcd08d99055697..a521b79fb5f8fc07b3f9102cec6de074186fe5c1:/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 660158a75f..3e2322d47a 100644 --- a/src/bindings/java/org/simgrid/NativeLib.java +++ b/src/bindings/java/org/simgrid/NativeLib.java @@ -1,24 +1,24 @@ -/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ 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; import java.nio.file.Path; +import java.util.stream.Stream; /** Helper class loading the native functions of SimGrid that we use for downcalls * - * Almost all org.simgrid.msg.* classes contain a static bloc (thus executed when the class is loaded) + * Almost all org.simgrid.msg.* classes contain a static block (thus executed when the class is loaded) * containing a call to this. */ public final class NativeLib { + private static final boolean WINDOWS_OS = System.getProperty("os.name").toLowerCase().startsWith("win"); private static boolean isNativeInited = false; private static Path tempDir = null; // where the embeeded libraries are unpacked before loading them @@ -42,7 +42,7 @@ public final class NativeLib { if (isNativeInited) return; - if (System.getProperty("os.name").toLowerCase().startsWith("win")) + if (WINDOWS_OS) NativeLib.nativeInit("winpthread-1"); NativeLib.nativeInit("simgrid"); @@ -69,9 +69,9 @@ public final class NativeLib { System.err.println("\nCannot load the bindings to the "+name+" library in path "+getPath()+" and no usable SimGrid installation found on disk."); if (cause != null) { - if (cause.getMessage().matches(".*libcgraph.so.*")) + if (cause.getMessage().contains("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.*")) + else if (cause.getMessage().contains("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, if any. Read carefully the following error message."); @@ -79,7 +79,7 @@ public final class NativeLib { System.err.println(); cause.printStackTrace(); } 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("This jar file does not seem to fit your system, and no usable SimGrid installation found on disk for "+name+"."); } System.exit(1); } @@ -90,7 +90,24 @@ public final class NativeLib { // We must write the lib onto the disk before loading it -- stupid operating systems if (tempDir == null) { - tempDir = Files.createTempDirectory("simgrid-java-"); + final String tempPrefix = "simgrid-java-"; + + if (WINDOWS_OS) { + // The cleanup at exit fails on Windows where it is impossible to delete files which are still in + // use. Try to remove stale temporary files from previous executions, and limit disk usage. + Path tmpdir = (new File(System.getProperty("java.io.tmpdir"))).toPath(); + try (Stream paths = Files.find(tmpdir, 1, + (Path p, java.nio.file.attribute.BasicFileAttributes a) -> + a.isDirectory() && !p.equals(tmpdir) && + p.getFileName().toString().startsWith(tempPrefix))) { + paths.map(Path::toFile) + .map(FileCleaner::new) + .forEach(FileCleaner::run); + + } + } + + tempDir = Files.createTempDirectory(tempPrefix); // don't leak the files on disk, but remove it on JVM shutdown Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(tempDir.toFile()))); } @@ -100,29 +117,22 @@ public final class NativeLib { { name, "lib"+name+".so", /* linux */ name+".dll", "lib"+name+".dll", /* windows (pure and mingw) */ - "lib"+name+".dylib" /* mac osx */}) { + "lib"+name+".dylib" /* macOS */}) { - File fileOut = new File(tempDir.toFile().getAbsolutePath() + File.separator + filename); - boolean done = false; + File fileOut = new File(tempDir.toFile(), filename); try ( // Try-with-resources. These stream will be autoclosed when needed. InputStream in = NativeLib.class.getClassLoader().getResourceAsStream(path+filename); - OutputStream out = new FileOutputStream(fileOut); ) { if (in != null) { /* copy the library in position */ - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = in.read(buffer)) != -1) // Read until EOF - out.write(buffer, 0, bytesRead); - done = true; - } - } - if (done) { - /* load that library */ - System.load(fileOut.getAbsolutePath()); + Files.copy(in, fileOut.toPath()); - /* It loaded! we're good */ - return true; + /* load that library */ + System.load(fileOut.getAbsolutePath()); + + /* It loaded! we're good */ + return true; + } } } @@ -142,11 +152,11 @@ public final class NativeLib { else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch)) arch = "amd64"; - if (os.toLowerCase().startsWith("win")){ + if (os.toLowerCase().startsWith("win")) { os = "Windows"; - } else if (os.contains("OS X")) + } else if (os.contains("OS X")) { os = "Darwin"; - + } os = os.replace(' ', '_'); arch = arch.replace(' ', '_'); @@ -161,16 +171,16 @@ public final class NativeLib { } @Override public void run() { - try { - for (File f : dir.listFiles()) - if (! f.delete() && !f.getAbsolutePath().contains("appveyor")) // Be silent on AppVeyor to not break the tests. Ugly trick :) - System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown."); - if (! dir.delete() && !dir.getAbsolutePath().contains("appveyor") ) - System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown."); + try (Stream paths = Files.walk(dir.toPath())) { + paths.sorted(java.util.Comparator.reverseOrder()) + .map(java.nio.file.Path::toFile) + //.peek(System.err::println) // Prints what gets removed + .forEach(java.io.File::delete); } catch(Exception e) { - System.out.println("Error while cleaning temporary file "+dir.getAbsolutePath()+" during shutdown: "+e.getCause()); + System.err.println("Error while cleaning temporary file " + dir.getAbsolutePath() + + ": " + e.getCause()); e.printStackTrace(); - } + } } } }