-/* Copyright (c) 2010, 2012-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010, 2012-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 "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/surf/cpu_interface.hpp"
+#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string.hpp>
#include <simgrid/msg.h>
#include <simgrid/s4u/Engine.hpp>
#include <string>
public:
double sampling_rate;
- Governor(simgrid::s4u::Host* ptr) : host(ptr) { init(); }
+ explicit Governor(simgrid::s4u::Host* ptr) : host(ptr) { init(); }
+ virtual ~Governor() = default;
void init()
{
class Performance : public Governor {
public:
- Performance(simgrid::s4u::Host* ptr) : Governor(ptr) {}
+ explicit Performance(simgrid::s4u::Host* ptr) : Governor(ptr) {}
void update() { host->setPstate(0); }
};
class Powersave : public Governor {
public:
- Powersave(simgrid::s4u::Host* ptr) : Governor(ptr) {}
+ explicit Powersave(simgrid::s4u::Host* ptr) : Governor(ptr) {}
void update() { host->setPstate(host->getPstatesCount() - 1); }
};
double freq_up_threshold = 0.95;
public:
- OnDemand(simgrid::s4u::Host* ptr) : Governor(ptr) {}
+ explicit OnDemand(simgrid::s4u::Host* ptr) : Governor(ptr) {}
void update()
{
double load = sg_host_get_current_load(host);
- if (load > freq_up_threshold) {
+ // FIXME I don't like that we multiply with the getCoreCount() just here...
+ if (load*host->getCoreCount() > freq_up_threshold) {
host->setPstate(0); /* Run at max. performance! */
XBT_INFO("Changed to pstate %f", 0.0);
} else {
/* The actual implementation uses a formula here: (See Kernel file cpufreq_ondemand.c:158)
*
- * freq_next = min_f + load * (max_f - min_f) / 100;
+ * freq_next = min_f + load * (max_f - min_f) / 100
*
* So they assume that frequency increases by 100 MHz. We will just use
- * lowest_pstate - load*pstatesCount();
+ * lowest_pstate - load*pstatesCount()
*/
int max_pstate = host->getPstatesCount() - 1;
+ int new_pstate = max_pstate - load * max_pstate;
+ host->setPstate(new_pstate);
- host->setPstate(max_pstate - load * max_pstate);
- XBT_INFO("Changed to pstate %f -- check: %i", max_pstate - load * max_pstate, host->getPstate());
+ XBT_DEBUG("Load: %f --> changed to pstate %i", load*host->getCoreCount(), new_pstate);
}
}
};
double freq_down_threshold = .2;
public:
- Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {}
+ explicit Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {}
void update()
{
- double load = sg_host_get_current_load(host);
+ double load = sg_host_get_current_load(host)*host->getCoreCount();
int pstate = host->getPstate();
if (load > freq_up_threshold) {
if (pstate != 0) {
host->setPstate(pstate - 1);
- XBT_INFO("Increasing performance to pstate %d", pstate - 1);
+ XBT_INFO("Load: %f > threshold: %f -> increasing performance to pstate %d", load, freq_up_threshold, pstate - 1);
}
else {
- XBT_DEBUG("Cannot speed up even more, already in slowest pstate %d", pstate);
+ XBT_DEBUG("Load: %f > threshold: %f -> but cannot speed up even more, already in highest pstate %d", load, freq_up_threshold, pstate);
}
}
int max_pstate = host->getPstatesCount() - 1;
if (pstate != max_pstate) { // Are we in the slowest pstate already?
host->setPstate(pstate + 1);
- XBT_INFO("Slowing down to pstate %d", pstate + 1);
+ XBT_INFO("Load: %f < threshold: %f -> slowing down to pstate %d", load, freq_down_threshold, pstate + 1);
}
else {
- XBT_DEBUG("Cannot slow down even more, already in slowest pstate %d", pstate);
+ XBT_DEBUG("Load: %f < threshold: %f -> cannot slow down even more, already in slowest pstate %d", load, freq_down_threshold, pstate);
}
}
}
public:
static simgrid::xbt::Extension<simgrid::s4u::Host, HostDvfs> EXTENSION_ID;
- explicit HostDvfs(simgrid::s4u::Host* ptr);
+ explicit HostDvfs(simgrid::s4u::Host*);
~HostDvfs();
-
-private:
- simgrid::s4u::Host* host = nullptr;
};
simgrid::xbt::Extension<simgrid::s4u::Host, HostDvfs> HostDvfs::EXTENSION_ID;
-HostDvfs::HostDvfs(simgrid::s4u::Host* ptr) : host(ptr)
-{
-}
+HostDvfs::HostDvfs(simgrid::s4u::Host* ptr) {}
HostDvfs::~HostDvfs() = default;
}
if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
return;
- std::string name = "dvfs-daemon-" + host.getName();
+ std::string name = std::string("dvfs-daemon-") + host.getCname();
simgrid::s4u::ActorPtr daemon = simgrid::s4u::Actor::createActor(name.c_str(), &host, []() {
- /**
- * This lambda function is the function the actor (daemon) will execute
- * all the time - in the case of the dvfs plugin, this controls when to
- * lower/raise the frequency.
- */
- simgrid::s4u::ActorPtr daemonProc = simgrid::s4u::Actor::self();
-
- XBT_DEBUG("DVFS process on %s is a daemon: %d", daemonProc->getHost()->getName().c_str(), daemonProc->isDaemon());
-
- std::string dvfs_governor;
- const char* host_conf = daemonProc->getHost()->getProperty("plugin/dvfs/governor");
- if (host_conf != nullptr) {
- dvfs_governor = std::string(daemonProc->getHost()->getProperty("plugin/dvfs/governor"));
- boost::algorithm::to_lower(dvfs_governor);
- }
- else {
- dvfs_governor = xbt_cfg_get_string("plugin/dvfs/governor");
- boost::algorithm::to_lower(dvfs_governor);
- }
-
- simgrid::plugin::dvfs::Governor governor(daemonProc->getHost());
- if (dvfs_governor == "conservative") {
- governor = simgrid::plugin::dvfs::Conservative(daemonProc->getHost());
- }
+ /**
+ * This lambda function is the function the actor (daemon) will execute
+ * all the time - in the case of the dvfs plugin, this controls when to
+ * lower/raise the frequency.
+ */
+ simgrid::s4u::ActorPtr daemonProc = simgrid::s4u::Actor::self();
+
+ XBT_DEBUG("DVFS process on %s is a daemon: %d", daemonProc->getHost()->getName().c_str(), daemonProc->isDaemon());
+
+ std::string dvfs_governor;
+ const char* host_conf = daemonProc->getHost()->getProperty("plugin/dvfs/governor");
+ if (host_conf != nullptr) {
+ dvfs_governor = std::string(daemonProc->getHost()->getProperty("plugin/dvfs/governor"));
+ boost::algorithm::to_lower(dvfs_governor);
+ } else {
+ dvfs_governor = xbt_cfg_get_string("plugin/dvfs/governor");
+ boost::algorithm::to_lower(dvfs_governor);
+ }
- while (1) {
- // Sleep *before* updating; important for startup (i.e., t = 0).
- // In the beginning, we want to go with the pstates specified in the platform file
- // (so we sleep first)
- simgrid::s4u::this_actor::sleep_for(governor.samplingRate());
- governor.update();
- XBT_INFO("Governor just updated!");
- }
+ simgrid::plugin::dvfs::Governor governor(daemonProc->getHost());
+ if (dvfs_governor == "conservative") {
+ governor = simgrid::plugin::dvfs::Conservative(daemonProc->getHost());
+ }
+ while (1) {
+ // Sleep *before* updating; important for startup (i.e., t = 0).
+ // In the beginning, we want to go with the pstates specified in the platform file
+ // (so we sleep first)
+ simgrid::s4u::this_actor::sleep_for(governor.samplingRate());
+ governor.update();
+ XBT_INFO("Governor just updated!");
+ }
- XBT_WARN("I should have never reached this point: daemons should be killed when all regular processes are done");
- return 0;
+ XBT_WARN("I should have never reached this point: daemons should be killed when all regular processes are done");
+ return 0;
});
// This call must be placed in this function. Otherweise, the daemonize() call comes too late and
}
/* **************************** Public interface *************************** */
-SG_BEGIN_DECL()
+extern "C" {
/** \ingroup SURF_plugin_load
* \brief Initializes the HostDvfs plugin
xbt_cfg_register_string("plugin/dvfs/governor", "performance", nullptr,
"Which Governor should be used that adapts the CPU frequency?");
}
-
-SG_END_DECL()
+}
