X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6644bdbf745687e07f95eea5f16c0bf7fef4ab83..30e93357d63b0846afb6a60db2004b6761607103:/src/surf/plugins/host_load.cpp

diff --git a/src/surf/plugins/host_load.cpp b/src/surf/plugins/host_load.cpp
index e22ceb62c2..94e8966a31 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
 
@@ -49,7 +39,7 @@ private:
   double current_flops     = 0;
   double computed_flops    = 0;
   double idle_time         = 0;
-  long   theor_max_flops   = 0;
+  double theor_max_flops   = 0;
   bool   was_prev_idle     = true; /* A host is idle at the beginning */
 };
 
@@ -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)
 {
@@ -71,27 +61,26 @@ HostLoad::~HostLoad() = default;
 void HostLoad::update()
 {
   double now = surf_get_clock();
-  if (last_updated < now) {
-    /* flops == pstate_speed * cores_being_currently_used */
-    computed_flops += (now - last_updated) * current_flops;
 
-    /* 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 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->get_constraint()->get_usage();
 
-    if (was_prev_idle) {
-      idle_time += (now - last_updated);
-    }
+  /* flops == pstate_speed * cores_being_currently_used */
+  computed_flops += (now - last_updated) * current_flops;
 
-    theor_max_flops += current_speed * host->getCoreCount() * (now - last_updated);
-    current_speed    = host->getSpeed();
-    last_updated     = now;
-    was_prev_idle    = (current_flops == 0);
+  if (was_prev_idle) {
+    idle_time += (now - last_updated);
   }
+
+  theor_max_flops += current_speed * host->getCoreCount() * (now - last_updated);
+  current_speed    = host->getSpeed();
+  last_updated     = now;
+  was_prev_idle    = (current_flops == 0);
 }
 
 /**
- * WARNING: This function does not guarantee that you have the real load at any time;
+ * WARNING: This function does not guarantee that you have the real load at any time
  * imagine all actions on your CPU terminate at time t. Your load is then 0. Then
  * you query the load (still 0) and then another action starts (still at time t!).
  * This means that the load was never really 0 (because the time didn't advance) but
@@ -116,13 +105,15 @@ double HostLoad::getIdleTime() {
 
 double HostLoad::getAverageLoad()
 {
-  return getComputedFlops() / (host->getSpeed() * host->getCoreCount() * (surf_get_clock() - last_reset));
+  if (theor_max_flops == 0) { // Avoid division by 0
+    return 0;
+  }
+
+  return computed_flops / theor_max_flops;
 }
 
 double HostLoad::getComputedFlops()
 {
-  update();
-
   return computed_flops;
 }
 
@@ -136,7 +127,8 @@ 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);
 }
 }
@@ -156,7 +148,7 @@ static void onHostChange(simgrid::s4u::Host& host)
 }
 
 /* This callback is called when an action (computation, idle, ...) terminates */
-static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::surf::Action::State /*previous*/)
+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();
@@ -171,7 +163,6 @@ static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::surf:
 }
 
 /* **************************** Public interface *************************** */
-extern "C" {
 
 /** \ingroup plugin_load
  * \brief Initializes the HostLoad plugin
@@ -186,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
@@ -248,4 +239,3 @@ void sg_host_load_reset(sg_host_t host)
 
   host->extension<HostLoad>()->reset();
 }
-}