X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/934b99618c47f4cb4b0761aa80a8147672108f58..4669bd296b7e363e8b25cf53990622c51c33c373:/src/plugins/host_load.cpp

diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp
index c8b03e53cb..3f95fb40c9 100644
--- a/src/plugins/host_load.cpp
+++ b/src/plugins/host_load.cpp
@@ -1,13 +1,16 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. 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 "src/include/surf/surf.hpp"
+#include <simgrid/plugins/load.h>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Exec.hpp>
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+
 #include "src/kernel/activity/ExecImpl.hpp"
-#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include <simgrid/s4u.hpp>
+#include "src/surf/surf_interface.hpp"
 
 // Makes sure that this plugin can be activated from the command line with ``--cfg=plugin:host_load``
 SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init)
@@ -57,13 +60,12 @@ public:
 
   explicit HostLoad(simgrid::s4u::Host* ptr)
       : host_(ptr)
-      , last_updated_(surf_get_clock())
-      , last_reset_(surf_get_clock())
+      , last_updated_(simgrid_get_clock())
+      , last_reset_(simgrid_get_clock())
       , current_speed_(host_->get_speed())
       , current_flops_(host_->get_load())
   {
   }
-  ~HostLoad() = default;
   HostLoad() = delete;
   explicit HostLoad(simgrid::s4u::Host& ptr) = delete;
   explicit HostLoad(simgrid::s4u::Host&& ptr) = delete;
@@ -116,7 +118,7 @@ void HostLoad::add_activity(simgrid::kernel::activity::ExecImpl* activity)
 
 void HostLoad::update()
 {
-  double now = surf_get_clock();
+  double now = simgrid_get_clock();
 
   // This loop updates the flops that the host executed for the ongoing computations
   auto iter = begin(current_activities);
@@ -179,8 +181,8 @@ double HostLoad::get_current_load() const
  */
 void HostLoad::reset()
 {
-  last_updated_    = surf_get_clock();
-  last_reset_      = surf_get_clock();
+  last_updated_    = simgrid_get_clock();
+  last_reset_      = simgrid_get_clock();
   idle_time_       = 0;
   computed_flops_  = 0;
   theor_max_flops_ = 0;
@@ -247,16 +249,18 @@ void sg_host_load_plugin_init()
       XBT_WARN("HostLoad plugin currently does not support executions on several hosts");
     }
   });
-  simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Exec const& activity) {
-    if (activity.get_host_number() == 1) { // We only run on one host
-      simgrid::s4u::Host* host         = activity.get_host();
+  simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) {
+    const auto* exec = dynamic_cast<simgrid::s4u::Exec*>(&activity);
+    if (exec == nullptr) // Only Execs are concerned here
+      return;
+    if (exec->get_host_number() == 1) { // We only run on one host
+      simgrid::s4u::Host* host               = exec->get_host();
       const simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(host);
       if (vm != nullptr)
         host = vm->get_pm();
       xbt_assert(host != nullptr);
       host->extension<HostLoad>()->update();
-    }
-    else { // This runs on multiple hosts
+    } else { // This runs on multiple hosts
       XBT_WARN("HostLoad plugin currently does not support executions on several hosts");
     }
   });