Merge branch 'vmtrace'

[simgrid.git] / org / simgrid / trace / Trace.java

diff --git a/org/simgrid/trace/Trace.java b/org/simgrid/trace/Trace.java
index 6b51d85..7943ed4 100644 (file)
--- a/org/simgrid/trace/Trace.java
+++ b/org/simgrid/trace/Trace.java
@@ -10,6 +10,8 @@
  */
 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 {
@@ -27,13 +29,7 @@ public final class Trace {
 
        // TODO complete the binding of the tracing API 
        
-       /**
-        * Declare a new user variable associated to hosts. 
-        * 
-        * @param variable
-        */
-       public final static native      void hostVariableDeclare (String variable);
- 
+
        /**
         * Declare a new user variable associated to hosts with a color. 
         *  
@@ -42,15 +38,7 @@ public final class Trace {
         */
        public final static native      void hostVariableDeclareWithColor (String variable, String color);
        
-       /**
-        * Set the value of a variable of a host. 
-        * 
-        * @param host
-        * @param variable
-        * @param value
-        */
-       public final static native      void hostVariableSet (String host, String variable, double value);
- 
+       
        /**
         *  Add a value to a variable of a host. 
         *  
@@ -297,5 +285,37 @@ public final class Trace {
         */
        public final static native void hostPopState (String host, String state);
 
-       
+       /**
+        * Declare a new user variable associated to hosts. 
+        * 
+        * @param variable
+        */
+       public final static native      void hostVariableDeclare (String variable);
+ 
+
+       /**
+        * Set the value of a variable of a host. 
+        * 
+        * @param host
+        * @param variable
+        * @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);
 }