-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2019. 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/energy.h"
#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
#include "src/include/surf/surf.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/surf/cpu_interface.hpp"
double get_current_watts_value();
double get_current_watts_value(double cpu_load);
double get_consumed_energy();
+ double get_idle_consumption();
double get_watt_min_at(int pstate);
double get_watt_max_at(int pstate);
void update();
HostEnergy::~HostEnergy() = default;
+double HostEnergy::get_idle_consumption()
+{
+ xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s",
+ host_->get_cname());
+
+ return power_range_watts_list_[0].idle_;
+}
+
double HostEnergy::get_watt_min_at(int pstate)
{
xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s",
// In this case, 1core == AllCores
current_power_values.push_back(current_power_values.at(1));
} else { // size == 3
- current_power_values[2] = current_power_values.at(1);
+ current_power_values[1] = current_power_values.at(2);
+ current_power_values[2] = current_power_values.at(2);
static bool displayed_warning = false;
if (not displayed_warning) { // Otherwise we get in the worst case no_pstate*no_hosts warnings
XBT_WARN("Host %s is a single-core machine and part of the power profile is '%s'"
", which is in the 'Idle:OneCore:AllCores' format."
- " Since this is a single-core machine, AllCores and OneCore are identical."
- " Here, only the value for 'OneCore' is used.", host_->get_cname(), current_power_values_str.c_str());
+ " Here, only the value for 'AllCores' is used.", host_->get_cname(), current_power_values_str.c_str());
displayed_warning = true;
}
}
simgrid::s4u::Host::on_destruction.connect(&on_host_destruction);
simgrid::s4u::on_simulation_end.connect(&on_simulation_end);
simgrid::surf::CpuAction::on_state_change.connect(&on_action_state_change);
+ // We may only have one actor on a node. If that actor executes something like
+ // compute -> recv -> compute
+ // the recv operation will not trigger a "CpuAction::on_state_change". This means
+ // that the next trigger would be the 2nd compute, hence ignoring the idle time
+ // during the recv call. By updating at the beginning of a compute, we can
+ // fix that. (If the cpu is not idle, this is not required.)
+ simgrid::kernel::activity::ExecImpl::on_creation.connect([](simgrid::kernel::activity::ExecImplPtr activity){
+ if (activity->host_ != nullptr) { // We only run on one host
+ simgrid::s4u::Host* host = activity->host_;
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_))
+ host = dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_)->get_pm();
+
+ host->extension<HostEnergy>()->update();
+ }
+ });
}
/** @ingroup plugin_energy
return host->extension<HostEnergy>()->get_consumed_energy();
}
+/** @ingroup plugin_energy
+ * @brief Get the amount of watt dissipated when the host is idling
+ */
+double sg_host_get_idle_consumption(sg_host_t host)
+{
+ xbt_assert(HostEnergy::EXTENSION_ID.valid(),
+ "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization.");
+ return host->extension<HostEnergy>()->get_idle_consumption();
+}
+
/** @ingroup plugin_energy
* @brief Get the amount of watt dissipated at the given pstate when the host is idling
*/