Merge branch 'master' of github.com: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 3b22144..b40704c 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Host.java
+++ b/src/bindings/java/org/simgrid/msg/Host.java
@@ -1,6 +1,6 @@
 /* Bindings to the MSG hosts */
 
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. The SimGrid Team. All rights 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. */
@@ -143,7 +143,13 @@ public class Host {
         * the value will be updated in kernel mode before returning the control to the requesting actor.
         */
        public native double getConsumedEnergy();
-       
+
+       /** Returns the current load of the host */
+       public native double getCurrentLoad();
+       /** Returns the number of flops computed of the host */
+       public native double getComputedFlops();
+       /** Returns the average load of the host */
+       public native double getAvgLoad();
        /** Returns the current pstate */
        public native int getPstate();
        /** Changes the current pstate */
@@ -153,7 +159,9 @@ public class Host {
        public native double getCurrentPowerPeak();
        /** Returns the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. */
        public native double getPowerPeakAt(int pstate);
-       
+
+       /** Returns the current computation load (in flops per second) */
+       public native double getLoad();
 
        /** Class initializer, to initialize various JNI stuff */
        private static native void nativeInit();