X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cbf54871089cc3dc50b6832652b5765e1601039..b63adff37a6c05384b40d5c5bd5be49b246cf9fc:/src/surf/plugins/host_load.cpp diff --git a/src/surf/plugins/host_load.cpp b/src/surf/plugins/host_load.cpp index 9fc9f0722a..039f23cda7 100644 --- a/src/surf/plugins/host_load.cpp +++ b/src/surf/plugins/host_load.cpp @@ -4,17 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/plugins/load.h" -#include "simgrid/simix.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/cpu_interface.hpp" - -#include "simgrid/s4u/Engine.hpp" - -#include -#include -#include -#include -#include /** @addtogroup plugin_load @@ -60,7 +50,7 @@ HostLoad::HostLoad(simgrid::s4u::Host* ptr) , last_updated(surf_get_clock()) , last_reset(surf_get_clock()) , current_speed(host->getSpeed()) - , current_flops(host->pimpl_cpu->constraint()->get_usage()) + , current_flops(host->pimpl_cpu->get_constraint()->get_usage()) , theor_max_flops(0) , was_prev_idle(current_flops == 0) { @@ -74,7 +64,7 @@ void HostLoad::update() /* Current flop per second computed by the cpu; current_flops = k * pstate_speed_in_flops, k \in {0, 1, ..., cores} * number of active cores */ - current_flops = host->pimpl_cpu->constraint()->get_usage(); + current_flops = host->pimpl_cpu->get_constraint()->get_usage(); /* flops == pstate_speed * cores_being_currently_used */ computed_flops += (now - last_updated) * current_flops; @@ -137,7 +127,7 @@ void HostLoad::reset() idle_time = 0; computed_flops = 0; theor_max_flops = 0; - current_flops = host->pimpl_cpu->constraint()->get_usage(); + current_flops = host->pimpl_cpu->get_constraint()->get_usage(); current_speed = host->getSpeed(); was_prev_idle = (current_flops == 0); }