Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / bindings / java / org / simgrid / msg / Host.java

diff --git a/src/bindings/java/org/simgrid/msg/Host.java b/src/bindings/java/org/simgrid/msg/Host.java
index bfa1997..aa058cf 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Host.java
+++ b/src/bindings/java/org/simgrid/msg/Host.java
@@ -164,14 +164,6 @@ public class Host {
        public native void off();
 
 
-       /**
-        * This method returns the number of tasks currently running on a host.
-        * The external load is not taken in account.
-        *
-        * @return                      The number of tasks currently running on a host.
-        */ 
-       public native int getLoad();
-
        /**
         * This method returns the speed of the processor of a host,
         * regardless of the current load of the machine.
@@ -214,6 +206,8 @@ public class Host {
         */
        public native String[] getAttachedStorage();
 
+       /** Returns the amount of Joules consumed by that host so far */
+       public native double getConsumedEnergy();
 
        /**
         * Class initializer, to initialize various JNI stuff