Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid-java

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

diff --git a/org/simgrid/trace/Trace.java b/org/simgrid/trace/Trace.java
index 57ea5a2..be6f085 100644 (file)
--- a/org/simgrid/trace/Trace.java
+++ b/org/simgrid/trace/Trace.java
@@ -1,19 +1,21 @@
-package org.simgrid.trace;
-
 /*
  * JNI interface to C code for the TRACES part of SimGrid.
  * 
- * Copyright 2006,2007,2010,2011, 2012 The SimGrid Team.           
+ * Copyright 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.
  */
+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) {
@@ -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,20 @@ 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);
 }