A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make protected field const (sonar).
[simgrid.git]
/
src
/
surf
/
plugins
/
host_dvfs.cpp
diff --git
a/src/surf/plugins/host_dvfs.cpp
b/src/surf/plugins/host_dvfs.cpp
index
fd3a238
..
3daf923
100644
(file)
--- a/
src/surf/plugins/host_dvfs.cpp
+++ b/
src/surf/plugins/host_dvfs.cpp
@@
-1,23
+1,14
@@
-/* Copyright (c) 2010
, 2012-2018. The SimGrid Team. All rights reserved.
*/
+/* Copyright (c) 2010
-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 "simgrid/plugins/dvfs.h"
#include "simgrid/plugins/load.h"
/* 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/dvfs.h"
#include "simgrid/plugins/load.h"
-#include "simgrid/simix.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include
"src/surf/cpu_interface.hpp"
+#include
<xbt/config.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <simgrid/msg.h>
-#include <simgrid/s4u/Engine.hpp>
-#include <string>
-#include <utility>
-#include <vector>
-#include <xbt/config.hpp>
/** @addtogroup SURF_plugin_load
/** @addtogroup SURF_plugin_load
@@
-37,7
+28,7
@@
namespace dvfs {
class Governor {
protected:
class Governor {
protected:
- simgrid::s4u::Host* host;
+ simgrid::s4u::Host*
const
host;
public:
double sampling_rate;
public:
double sampling_rate;
@@
-108,7
+99,7
@@
public:
*/
class OnDemand : public Governor {
/**
*/
class OnDemand : public Governor {
/**
- * See https://elixir.bootlin.com/linux/v4.15.4/source/drivers/cpufreq/cpufreq_ondemand.c
+ * See https://elixir.bootlin.com/linux/v4.15.4/source/drivers/cpufreq/cpufreq_ondemand.c
* DEF_FREQUENCY_UP_THRESHOLD and od_update()
*/
double freq_up_threshold = 0.80;
* DEF_FREQUENCY_UP_THRESHOLD and od_update()
*/
double freq_up_threshold = 0.80;
@@
-234,45
+225,45
@@
static void on_host_added(simgrid::s4u::Host& host)
if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
return;
if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
return;
- std::string name = std::string("dvfs-daemon-") + host.get
C
name();
- simgrid::s4u::ActorPtr daemon = simgrid::s4u::Actor::create
Actor
(name.c_str(), &host, []() {
+ std::string name = std::string("dvfs-daemon-") + host.get
_c
name();
+ simgrid::s4u::ActorPtr daemon = simgrid::s4u::Actor::create(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.
*/
/**
* 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 daemon
P
roc = simgrid::s4u::Actor::self();
+ simgrid::s4u::ActorPtr daemon
_p
roc = simgrid::s4u::Actor::self();
- XBT_DEBUG("DVFS process on %s is a daemon: %d", daemon
Proc->getHost()->getName().c_str(), daemonProc->isD
aemon());
+ XBT_DEBUG("DVFS process on %s is a daemon: %d", daemon
_proc->get_host()->get_cname(), daemon_proc->is_d
aemon());
std::string dvfs_governor;
std::string dvfs_governor;
- const char* host_conf = daemon
Proc->getH
ost()->getProperty(property_governor);
+ const char* host_conf = daemon
_proc->get_h
ost()->getProperty(property_governor);
if (host_conf != nullptr) {
if (host_conf != nullptr) {
- dvfs_governor = std::string(daemon
Proc->getH
ost()->getProperty(property_governor));
+ dvfs_governor = std::string(daemon
_proc->get_h
ost()->getProperty(property_governor));
boost::algorithm::to_lower(dvfs_governor);
} else {
dvfs_governor = xbt_cfg_get_string(property_governor);
boost::algorithm::to_lower(dvfs_governor);
}
boost::algorithm::to_lower(dvfs_governor);
} else {
dvfs_governor = xbt_cfg_get_string(property_governor);
boost::algorithm::to_lower(dvfs_governor);
}
- auto governor = [&dvfs_governor, &daemon
P
roc]() {
+ auto governor = [&dvfs_governor, &daemon
_p
roc]() {
if (dvfs_governor == "conservative") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
if (dvfs_governor == "conservative") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
- new simgrid::plugin::dvfs::Conservative(daemon
Proc->getH
ost()));
+ new simgrid::plugin::dvfs::Conservative(daemon
_proc->get_h
ost()));
} else if (dvfs_governor == "ondemand") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
} else if (dvfs_governor == "ondemand") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
- new simgrid::plugin::dvfs::OnDemand(daemon
Proc->getH
ost()));
+ new simgrid::plugin::dvfs::OnDemand(daemon
_proc->get_h
ost()));
} else if (dvfs_governor == "performance") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
} else if (dvfs_governor == "performance") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
- new simgrid::plugin::dvfs::Performance(daemon
Proc->getH
ost()));
+ new simgrid::plugin::dvfs::Performance(daemon
_proc->get_h
ost()));
} else if (dvfs_governor == "powersave") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
} else if (dvfs_governor == "powersave") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
- new simgrid::plugin::dvfs::Powersave(daemon
Proc->getH
ost()));
+ new simgrid::plugin::dvfs::Powersave(daemon
_proc->get_h
ost()));
} else {
XBT_CRITICAL("No governor specified for host %s, falling back to Performance",
} else {
XBT_CRITICAL("No governor specified for host %s, falling back to Performance",
- daemon
Proc->getHost()->getC
name());
+ daemon
_proc->get_host()->get_c
name());
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
- new simgrid::plugin::dvfs::Performance(daemon
Proc->getH
ost()));
+ new simgrid::plugin::dvfs::Performance(daemon
_proc->get_h
ost()));
}
}();
}
}();
@@
-295,7
+286,6
@@
static void on_host_added(simgrid::s4u::Host& host)
}
/* **************************** Public interface *************************** */
}
/* **************************** Public interface *************************** */
-extern "C" {
/** \ingroup SURF_plugin_load
* \brief Initializes the HostDvfs plugin
/** \ingroup SURF_plugin_load
* \brief Initializes the HostDvfs plugin
@@
-316,4
+306,3
@@
void sg_host_dvfs_plugin_init()
xbt_cfg_register_string(property_governor, "performance", nullptr,
"Which Governor should be used that adapts the CPU frequency?");
}
xbt_cfg_register_string(property_governor, "performance", nullptr,
"Which Governor should be used that adapts the CPU frequency?");
}
-}