X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b9b1de6620a3cd0dfb18d30c671bb035d236ee7..198b09ec16ca1b8fc05053bcae9e75c0ad689711:/src/bindings/java/org/simgrid/msg/Msg.java

diff --git a/src/bindings/java/org/simgrid/msg/Msg.java b/src/bindings/java/org/simgrid/msg/Msg.java
index 6cdc8944e1..9c04644aed 100644
--- a/src/bindings/java/org/simgrid/msg/Msg.java
+++ b/src/bindings/java/org/simgrid/msg/Msg.java
@@ -9,104 +9,55 @@
 package org.simgrid.msg;
 import org.simgrid.NativeLib;
 
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-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");      
-		isNativeInited = true;
-	}
 
-	static {
-		nativeInit();
+	/** Retrieves the simulation time */
+	public static final native double getClock();
+	/** Issue a debug logging message. */
+	public static final native void debug(String msg);
+	/** Issue a verbose logging message. */
+	public static final native void verb(String msg);
+	/** Issue an information logging message */
+	public static final native void info(String msg);
+	/** Issue a warning logging message. */
+	public static final native void warn(String msg);
+	/** Issue an error logging message. */
+	public static final native void error(String msg);
+	/** Issue a critical logging message. */
+	public static final native void critical(String s);
+
+	private Msg() {
+		throw new IllegalAccessError("Utility class");
 	}
 
-	/** Retrieve the simulation time
-	 * @return The simulation time.
-	 */
-	public final static native double getClock();
-	/**
-	 * Issue a debug logging message.
-	 * @param s message to log.
-	 */
-	public final static native void debug(String s);
-	/**
-	 * Issue an verbose logging message.
-	 * @param s message to log.
-	 */
-	public final static native void verb(String s);
-
-	/** Issue an information logging message
-	 * @param s
-	 */
-	public final static native void info(String s);
-	/**
-	 * Issue an warning logging message.
-	 * @param s message to log.
-	 */
-	public final static native void warn(String s);
-	/**
-	 * Issue an error logging message.
-	 * @param s message to log.
-	 */
-	public final static native void error(String s);
-	/**
-	 * Issue an critical logging message.
-	 * @param s message to log.
-	 */
-	public final static native void critical(String s);
-
 	/*********************************************************************************
 	 * Deployment and initialization related functions                               *
 	 *********************************************************************************/
 
-	/**
-	 * The natively implemented method to initialize a MSG simulation.
+	/** Initialize a MSG simulation.
 	 *
 	 * @param args            The arguments of the command line of the simulation.
 	 */
-	public final static native void init(String[]args);
+	public static final native void init(String[]args);
+	
+	/** Tell the kernel that you want to use the energy plugin */
+	public static final native void energyInit();
 
-	/**
-	 * Run the MSG simulation.
+	/** Run the MSG simulation.
 	 *
-	 * The simulation is not cleaned afterward (see  
-	 * {@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. 
+	 * After the simulation, you can freely retrieve the information that you want.. 
+	 * In particular, retrieving the status 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(){}
+	public static final native void run() ;
 
-	/**
-	 * The native implemented method to create the environment of the simulation.
-	 *
-	 * @param platformFile    The XML file which contains the description of the environment of the simulation
-	 *
-	 */
-	public final static native void createEnvironment(String platformFile);
+	/** Create the simulation environment by parsing a platform file. */
+	public static final native void createEnvironment(String platformFile);
 
-	public final static native As environmentGetRoutingRoot();
+	public static final native As environmentGetRoutingRoot();
 
-	/**
-	 * The method to deploy the simulation.
-	 *
-	 *
-	 * @param deploymentFile
-	 */
-	public final static native void deployApplication(String deploymentFile);
+	/** Starts your processes by parsing a deployment file. */
+	public static final native void deployApplication(String deploymentFile);
 
 	/** Example launcher. You can use it or provide your own launcher, as you wish
 	 * @param args
@@ -127,4 +78,9 @@ public final class Msg {
 		/* Execute the simulation */
 		Msg.run();
 	}
+	
+	/* Class initializer, to initialize various JNI stuff */
+	static {
+		org.simgrid.NativeLib.nativeInit();
+	}
 }