From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Wed, 30 Jan 2013 17:20:59 +0000 (+0100)
Subject: Merge commit '4df273f15273f959fc9e6ed69d2bf5e607ec9bf7' into HEAD
X-Git-Tag: v3_9_90~569^2~19^2~1^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e0cc75839bb97e7c5a4c25ed97dc53c8acdb011?hp=-c

Merge commit '4df273f15273f959fc9e6ed69d2bf5e607ec9bf7' into HEAD
---

9e0cc75839bb97e7c5a4c25ed97dc53c8acdb011
diff --combined org/simgrid/trace/Trace.java
index be6f085e3d,ede59a5747..7943ed40cd
--- a/org/simgrid/trace/Trace.java
+++ b/org/simgrid/trace/Trace.java
@@@ -10,12 -10,9 +10,12 @@@
   */
  package org.simgrid.trace;
  
 +import org.simgrid.msg.Msg;
 +
  public final class Trace {
  	/* Statically load the library which contains all native functions used in here */
  	static {
 +		Msg.nativeInit();
  		try {
  			System.loadLibrary("SG_java_tracing");
  		} catch(UnsatisfiedLinkError e) {
@@@ -301,4 -298,21 +301,21 @@@
  	 * @param value
  	 */
  	public final static native	void hostVariableSet (String host, String variable, double value);
+ 
+ 	/**
+ 	 * Declare a new user variable associated to VMs. 
+ 	 * 
+ 	 * @param variable
+ 	 */
+ 	public final static native	void vmVariableDeclare (String variable);
+  
+ 
+ 	/**
+ 	 * Set the value of a variable of a VM. 
+ 	 * 
+ 	 * @param host
+ 	 * @param variable
+ 	 * @param value
+ 	 */
+ 	public final static native	void vmVariableSet (String vm, String variable, double value);
  }