From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 2 Oct 2015 20:57:56 +0000 (+0200)
Subject: [java] unpack dll/so to a tempDir instead of messing with their name
X-Git-Tag: v3_12~53
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c80ea3788d692dc92728cefdd199e83a93a6fa25?ds=sidebyside

[java] unpack dll/so to a tempDir instead of messing with their name
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 4e61de9c82..2f583a9ef3 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -10,8 +10,46 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;
+import java.nio.file.Files;
+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;
+	public static void nativeInit() {
+		if (isNativeInited)
+			return;
+	        
+		if (System.getProperty("os.name").toLowerCase().startsWith("win"))
+			NativeLib.nativeInit("winpthread-1");
+
+		NativeLib.nativeInit("simgrid");
+		NativeLib.nativeInit("surf-java");
+		NativeLib.nativeInit("simgrid-java");      
+		isNativeInited = true;
+	}
+
+	static {
+		nativeInit();
+	}
+
+
+	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);
+			}
+		}
+	}
 
 	public static String getPath() {
 		String prefix = "NATIVE";
@@ -35,23 +73,7 @@ public final class NativeLib {
 
 		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);
-			}
-		}
-	}
-
+	static Path tempDir = null;
 	private static void loadLib (String name) throws SimGridLibNotFoundException {
 		String Path = NativeLib.getPath();
 
@@ -79,13 +101,15 @@ public final class NativeLib {
 		}
 		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);
+			if (tempDir == null) {
+				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())));
+			}
+			File fileOut = new File(tempDir.toFile().getAbsolutePath() + File.separator + filename);
 
 			/* 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
@@ -104,15 +128,17 @@ public final class NativeLib {
 
 	/* 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;
+		private File dir;
+		public FileCleaner(File dir) {
+			this.dir = dir;
 		}
 		public void run() {
 			try {
-				new File(target).delete();
+			    for (File f : dir.listFiles())
+			        f.delete();
+				dir.delete();
 			} catch(Exception e) {
-				System.out.println("Unable to clean temporary file "+target+" during shutdown.");
+				System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");
 				e.printStackTrace();
 			}
 		}    
diff --git a/src/bindings/java/org/simgrid/msg/Comm.java b/src/bindings/java/org/simgrid/msg/Comm.java
index b4d2341024..86c33cbd5f 100644
--- a/src/bindings/java/org/simgrid/msg/Comm.java
+++ b/src/bindings/java/org/simgrid/msg/Comm.java
@@ -80,7 +80,7 @@ public class Comm {
 	 */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}	
 }
diff --git a/src/bindings/java/org/simgrid/msg/File.java b/src/bindings/java/org/simgrid/msg/File.java
index bd19252e4d..015d080266 100644
--- a/src/bindings/java/org/simgrid/msg/File.java
+++ b/src/bindings/java/org/simgrid/msg/File.java
@@ -45,12 +45,10 @@ public class File {
 	 */
 	public native void close();
 
-	/**
-	 * Class initializer, to initialize various JNI stuff
-	 */
+	/** Class initializer, to initialize various JNI stuff */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}	
 }
\ No newline at end of file
diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java
index d46b4d86e5..b324db8aa4 100644
--- a/src/bindings/java/org/simgrid/msg/Msg.java
+++ b/src/bindings/java/org/simgrid/msg/Msg.java
@@ -11,23 +11,6 @@ import org.simgrid.NativeLib;
 
 
 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;
-	        
-		if (System.getProperty("os.name").toLowerCase().startsWith("win"))
-			NativeLib.nativeInit("winpthread-1");
-
-		NativeLib.nativeInit("simgrid");
-		NativeLib.nativeInit("simgrid-java");      
-		isNativeInited = true;
-	}
-
-	static {
-		nativeInit();
-	}
 
 	/** Retrieve the simulation time
 	 * @return The simulation time.
@@ -126,4 +109,9 @@ public final class Msg {
 		/* Execute the simulation */
 		Msg.run();
 	}
+	
+	/* Class initializer, to initialize various JNI stuff */
+	static {
+		org.simgrid.NativeLib.nativeInit();
+	}
 }
diff --git a/src/bindings/java/org/simgrid/msg/Mutex.java b/src/bindings/java/org/simgrid/msg/Mutex.java
index 503588b3dd..ed7340be75 100644
--- a/src/bindings/java/org/simgrid/msg/Mutex.java
+++ b/src/bindings/java/org/simgrid/msg/Mutex.java
@@ -34,7 +34,7 @@ public class Mutex {
 	 */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}	
 }
diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index 5c55f108c1..5e53e74f10 100644
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -363,7 +363,7 @@ public abstract class Process implements Runnable {
 	 */
 	private static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}
 	/**
diff --git a/src/bindings/java/org/simgrid/msg/RngStream.java b/src/bindings/java/org/simgrid/msg/RngStream.java
index 9e0ec6f08d..23e95cb973 100644
--- a/src/bindings/java/org/simgrid/msg/RngStream.java
+++ b/src/bindings/java/org/simgrid/msg/RngStream.java
@@ -113,7 +113,7 @@ public class RngStream {
 	 */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}
 }
diff --git a/src/bindings/java/org/simgrid/msg/Semaphore.java b/src/bindings/java/org/simgrid/msg/Semaphore.java
index 9be79f6a02..0172aa3b03 100644
--- a/src/bindings/java/org/simgrid/msg/Semaphore.java
+++ b/src/bindings/java/org/simgrid/msg/Semaphore.java
@@ -80,7 +80,7 @@ public class Semaphore {
 	 */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}
 }
\ No newline at end of file
diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java
index 46f568a443..2b9481fff9 100644
--- a/src/bindings/java/org/simgrid/msg/Task.java
+++ b/src/bindings/java/org/simgrid/msg/Task.java
@@ -363,7 +363,7 @@ public class Task {
 	 */
 	public static native void nativeInit();
 	static {
-		Msg.nativeInit();
+		org.simgrid.NativeLib.nativeInit();
 		nativeInit();
 	}
 
diff --git a/src/bindings/java/org/simgrid/surf/SurfJNI.java b/src/bindings/java/org/simgrid/surf/SurfJNI.java
index 277db31da4..af1eff380a 100644
--- a/src/bindings/java/org/simgrid/surf/SurfJNI.java
+++ b/src/bindings/java/org/simgrid/surf/SurfJNI.java
@@ -13,10 +13,7 @@ import org.simgrid.NativeLib;
 public class SurfJNI {
 
   static {
-    if (System.getProperty("os.name").toLowerCase().startsWith("win"))
-        NativeLib.nativeInit("winpthread-1");
-    NativeLib.nativeInit("simgrid");
-    NativeLib.nativeInit("surf-java");
+    org.simgrid.NativeLib.nativeInit();    
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
         public void run() {
diff --git a/src/bindings/java/org/simgrid/trace/Trace.java b/src/bindings/java/org/simgrid/trace/Trace.java
index 4892ac32e1..70cb9e03f9 100644
--- a/src/bindings/java/org/simgrid/trace/Trace.java
+++ b/src/bindings/java/org/simgrid/trace/Trace.java
@@ -8,12 +8,12 @@
 
 package org.simgrid.trace;
 
-import org.simgrid.msg.Msg;
+import org.simgrid.NativeLib;
 
 public final class Trace {
 	/* Statically load the library which contains all native functions used in here */
 	static {
-		Msg.nativeInit();
+		NativeLib.nativeInit();
 	}
 
 	// TODO complete the binding of the tracing API 
diff --git a/src/bindings/java/surf.i b/src/bindings/java/surf.i
index 2332cbc26e..95c1130f0e 100644
--- a/src/bindings/java/surf.i
+++ b/src/bindings/java/surf.i
@@ -16,10 +16,7 @@ import org.simgrid.NativeLib;
 %}
 %pragma(java) jniclasscode=%{
   static {
-    if (System.getProperty("os.name").toLowerCase().startsWith("win"))
-        NativeLib.nativeInit("winpthread-1");
-    NativeLib.nativeInit("simgrid");
-    NativeLib.nativeInit("surf-java");
+    org.simgrid.NativeLib.nativeInit();    
     Runtime.getRuntime().addShutdownHook(
       new Thread() {
         public void run() {