/* 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"
: 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_; };
}
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);
}
{
// 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());
}
/*
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
}
/* 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();
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) {