change exception raised if a StopRequest is catched in Host.off()

[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 0476da4..6042b04 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Host.java
+++ b/src/bindings/java/org/simgrid/msg/Host.java
@@ -1,14 +1,12 @@
 /* Bindings to the MSG hosts */
 
-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2019. 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. */
 
 package org.simgrid.msg;
 
-import org.simgrid.msg.Storage;
-
 /**
  * A host object represents a location (any possible place) where a process may run.
  * Thus it is represented as a physical resource with computing capabilities, some
@@ -113,7 +111,7 @@ public class Host {
        /** Starts the host if it is off */
        public native void on();
        /** Stops the host if it is on */
-       public native void off();
+       public native void off() throws ProcessKilledError;
 
        /**
         * This method returns the speed of the processor of a host (in flops),
@@ -143,7 +141,17 @@ 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, as a ratio = achieved_flops / (core_current_speed * core_amount)
+        *      
+        * See simgrid::plugin::HostLoad::get_current_load() for the full documentation.
+        */
+       public native double getCurrentLoad();
+       /** Returns the number of flops computed of the host since the beginning of the simulation */
+       public native double getComputedFlops();
+       /** Returns the average load of the host as a ratio since the beginning of the simulation*/
+       public native double getAvgLoad();
+   
        /** Returns the current pstate */
        public native int getPstate();
        /** Changes the current pstate */
@@ -153,7 +161,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();