X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9bee908f58f910dc08a8a3ed2c40b9b72dc21f0..52fd53c1927b271828348841b782281f64b7bef8:/src/plugins/host_load.cpp

diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp
index 27060c0caa..86d6f1a48f 100644
--- a/src/plugins/host_load.cpp
+++ b/src/plugins/host_load.cpp
@@ -3,6 +3,7 @@
 /* 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/s4u.hpp>
 #include "simgrid/plugins/load.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 
@@ -25,13 +26,16 @@ public:
       : host_(ptr)
       , last_updated_(surf_get_clock())
       , last_reset_(surf_get_clock())
-      , current_speed_(host_->getSpeed())
+      , current_speed_(host_->get_speed())
       , current_flops_(host_->pimpl_cpu->get_constraint()->get_usage())
       , theor_max_flops_(0)
       , was_prev_idle_(current_flops_ == 0)
   {
   }
   ~HostLoad() = default;
+  HostLoad() = delete;
+  explicit HostLoad(simgrid::s4u::Host& ptr) = delete;
+  explicit HostLoad(simgrid::s4u::Host&& ptr) = delete;
 
   double get_current_load();
   double get_average_load() { return (theor_max_flops_ == 0) ? 0 : computed_flops_ / theor_max_flops_; };
@@ -44,7 +48,14 @@ private:
   simgrid::s4u::Host* host_ = nullptr;
   double last_updated_      = 0;
   double last_reset_        = 0;
+  /**
+   * current_speed each core is running at right now
+   */
   double current_speed_     = 0;
+  /**
+   * How many flops are currently used by all the processes running on this
+   * host?
+   */
   double current_flops_     = 0;
   double computed_flops_    = 0;
   double idle_time_         = 0;
@@ -70,7 +81,7 @@ void HostLoad::update()
   }
 
   theor_max_flops_ += current_speed_ * host_->get_core_count() * (now - last_updated_);
-  current_speed_ = host_->getSpeed();
+  current_speed_ = host_->get_speed();
   last_updated_  = now;
   was_prev_idle_ = (current_flops_ == 0);
 }
@@ -87,7 +98,7 @@ double HostLoad::get_current_load()
 {
   // We don't need to call update() here because it is called every time an action terminates or starts
   // FIXME: Can this happen at the same time? stop -> call to getCurrentLoad, load = 0 -> next action starts?
-  return current_flops_ / static_cast<double>(host_->getSpeed() * host_->get_core_count());
+  return current_flops_ / static_cast<double>(host_->get_speed() * host_->get_core_count());
 }
 
 /*
@@ -101,7 +112,7 @@ void HostLoad::reset()
   computed_flops_  = 0;
   theor_max_flops_ = 0;
   current_flops_   = host_->pimpl_cpu->get_constraint()->get_usage();
-  current_speed_   = host_->getSpeed();
+  current_speed_   = host_->get_speed();
   was_prev_idle_   = (current_flops_ == 0);
 }
 } // namespace plugin
@@ -121,7 +132,7 @@ static void on_host_change(simgrid::s4u::Host& host)
 }
 
 /* This callback is called when an action (computation, idle, ...) terminates */
-static void on_action_state_change(simgrid::surf::CpuAction* action)
+static void on_action_state_change(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State /*previous*/)
 {
   for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
     simgrid::s4u::Host* host = cpu->get_host();
@@ -148,6 +159,14 @@ void sg_host_load_plugin_init()
 
   HostLoad::EXTENSION_ID = simgrid::s4u::Host::extension_create<HostLoad>();
 
+  if (simgrid::s4u::Engine::is_initialized()) { // If not yet initialized, this would create a new instance
+                                                // which would cause seg faults...
+    simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
+    for (auto& host : e->get_all_hosts()) {
+      host->extension_set(new HostLoad(host));
+    }
+  }
+
   /* When attaching a callback into a signal, you can use a lambda as follows, or a regular function as done below */
 
   simgrid::s4u::Host::on_creation.connect([](simgrid::s4u::Host& host) {