X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9966aa66acc63c0417fbeae8e3ff12bccb0cdb0..1c7dbc7e7255bc670c53414593e9fbdf5b366c1d:/src/surf/plugins/host_load.cpp

diff --git a/src/surf/plugins/host_load.cpp b/src/surf/plugins/host_load.cpp
index f30692e307..d915b593b3 100644
--- a/src/surf/plugins/host_load.cpp
+++ b/src/surf/plugins/host_load.cpp
@@ -1,20 +1,10 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-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. */
 
 #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 <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <string>
-#include <utility>
-#include <vector>
 
 /** @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);
 }
@@ -161,7 +151,7 @@ static void onHostChange(simgrid::s4u::Host& host)
 static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State /*previous*/)
 {
   for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
-    simgrid::s4u::Host* host = cpu->getHost();
+    simgrid::s4u::Host* host = cpu->get_host();
 
     if (dynamic_cast<simgrid::s4u::VirtualMachine*>(host)) // Ignore virtual machines
       return;
@@ -173,7 +163,6 @@ static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::kerne
 }
 
 /* **************************** Public interface *************************** */
-extern "C" {
 
 /** \ingroup plugin_load
  * \brief Initializes the HostLoad plugin
@@ -188,15 +177,15 @@ void sg_host_load_plugin_init()
 
   /* When attaching a callback into a signal, you can use a lambda as follows, or a regular function as done below */
 
-  simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
+  simgrid::s4u::Host::on_creation.connect([](simgrid::s4u::Host& host) {
     if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
       return;
     host.extension_set(new HostLoad(&host));
   });
 
   simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange);
-  simgrid::s4u::Host::onStateChange.connect(&onHostChange);
-  simgrid::s4u::Host::onSpeedChange.connect(&onHostChange);
+  simgrid::s4u::Host::on_state_change.connect(&onHostChange);
+  simgrid::s4u::Host::on_speed_change.connect(&onHostChange);
 }
 
 /** @brief Returns the current load of the host passed as argument
@@ -250,4 +239,3 @@ void sg_host_load_reset(sg_host_t host)
 
   host->extension<HostLoad>()->reset();
 }
-}