X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e67b024cf0592ddef06e37870b36d4a4dfe058b..f2df13795e01302813a6aef10825ec7e922ce530:/src/bindings/java/org/simgrid/msg/Msg.java?ds=sidebyside

diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java
index 895fadf9e5..ec212a7d8e 100644
--- a/src/bindings/java/org/simgrid/msg/Msg.java
+++ b/src/bindings/java/org/simgrid/msg/Msg.java
@@ -1,15 +1,13 @@
-/*
- * JNI interface to C code for MSG.
- * 
- * Copyright 2006-2012 The SimGrid Team.           
- * All right 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.
- */
+/* JNI interface to C code for MSG. */
+
+/* Copyright (c) 2006-2014. 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.msg;
+import org.simgrid.NativeLib;
 
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -20,99 +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;
-		try {
-			/* prefer the version on disk, if existing */
-			System.loadLibrary("SG_java");
-		} catch (UnsatisfiedLinkError e) {
-			/* If not found, unpack the one bundled into the jar file and use it */
-			loadLib("simgrid");
-			loadLib("SG_java");
-		}
+        public static void nativeInit() {
+                if (isNativeInited)
+                      return;
+                NativeLib.nativeInit("simgrid");
+                NativeLib.nativeInit("simgrid-java");      
 		isNativeInited = true;
+
 	}
+
 	static {
-		nativeInit();
-	}
-	private static void loadLib (String name) {
-		String Path = "NATIVE/"+System.getProperty("os.name")+"/"+System.getProperty("os.arch")+"/";
-		String filename=name;
-		InputStream in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);
-		
-		if (in == null) {
-			filename = "lib"+name+".so";
-			in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);
-		} 
-		if (in == null) {
-			filename = name+".dll";
-			in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);
-		}  
-		if (in == null) {
-			filename = "lib"+name+".dll";
-			in = Msg.class.getClassLoader().getResourceAsStream(Path+filename);
-		}  
-		if (in == null) {
-			filename = "lib"+name+".dylib";
-			in = Msg.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.");
-		}
-// Caching the file on disk: desactivated because it could fool the users 		
-//		if (new File(filename).isFile()) {
-//			// file was already unpacked -- use it directly
-//			System.load(new File(".").getAbsolutePath()+File.separator+filename);
-//			return;
-//		}
-		try {
-			// We must write the lib onto the disk before loading it -- stupid operating systems
-			File fileOut = new File(filename);
-//			if (!new File(".").canWrite()) {
-//				System.out.println("Cannot write in ."+File.separator+filename+"; unpacking the library into a temporary file instead");
-				fileOut = File.createTempFile("simgrid-", ".tmp");
-				// don't leak the file on disk, but remove it on JVM shutdown
-				Runtime.getRuntime().addShutdownHook(new Thread(new FileCleaner(fileOut.getAbsolutePath())));
-//			}
-//			System.out.println("Unpacking SimGrid native library to " + 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 simgrid library: ");
-			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();
-            }
-        }    
+                nativeInit();
 	}
-
+        
     /** Retrieve the simulation time
-     * @return
+     * @return The simulation time.
      */
 	public final static native double getClock();
 	/**
@@ -154,8 +74,6 @@ public final class Msg {
 	 * The natively implemented method to initialize a MSG simulation.
 	 *
 	 * @param args            The arguments of the command line of the simulation.
-	 *
-	 * @see                    Msg.init()
 	 */
 	public final static native void init(String[]args);
 
@@ -166,8 +84,6 @@ public final class Msg {
 	 * {@link #clean()} if you really insist on cleaning the C side), so you can freely 
 	 * retrieve the informations that you want from the simulation. In particular, retrieving the status 
 	 * of a process or the current date is perfectly ok. 
-	 *
-	 * @see                    MSG_run
 	 */
 	public final static native void run() ;
 	
@@ -183,6 +99,8 @@ public final class Msg {
 	 */
 	public final static native void createEnvironment(String platformFile);
 
+	public final static native As environmentGetRoutingRoot();
+
 	/**
 	 * The method to deploy the simulation.
 	 *