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
Ignore Sonar issue "Macros should not be used to define constants" in *.h.
[simgrid.git]
/
src
/
plugins
/
host_dvfs.cpp
diff --git
a/src/plugins/host_dvfs.cpp
b/src/plugins/host_dvfs.cpp
index
3e1b9f2
..
370582d
100644
(file)
--- a/
src/plugins/host_dvfs.cpp
+++ b/
src/plugins/host_dvfs.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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. */
@@
-15,6
+15,9
@@
#include <xbt/config.hpp>
#include <boost/algorithm/string.hpp>
#include <xbt/config.hpp>
#include <boost/algorithm/string.hpp>
+#if HAVE_SMPI
+#include "src/smpi/include/smpi_request.hpp"
+#endif
SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init)
SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init)
@@
-26,7
+29,9
@@
static simgrid::config::Flag<std::string> cfg_governor("plugin/dvfs/governor",
"Which Governor should be used that adapts the CPU frequency?", "performance",
std::map<std::string, std::string>({
"Which Governor should be used that adapts the CPU frequency?", "performance",
std::map<std::string, std::string>({
+#if HAVE_SMPI
{"adagio", "TODO: Doc"},
{"adagio", "TODO: Doc"},
+#endif
{"conservative", "TODO: Doc"},
{"ondemand", "TODO: Doc"},
{"performance", "TODO: Doc"},
{"conservative", "TODO: Doc"},
{"ondemand", "TODO: Doc"},
{"performance", "TODO: Doc"},
@@
-35,14
+40,14
@@
static simgrid::config::Flag<std::string> cfg_governor("plugin/dvfs/governor",
[](std::string val) { if (val != "performance") sg_host_dvfs_plugin_init(); });
[](std::string val) { if (val != "performance") sg_host_dvfs_plugin_init(); });
-static simgrid::config::Flag<int>
cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"},
-
"Which pstate is the minimum (and hence fastest) pstate for this governor?", 0
,
-
[](int index
) {});
+static simgrid::config::Flag<int>
+
cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"}
,
+
"Which pstate is the minimum (and hence fastest) pstate for this governor?", 0, [](int
) {});
static const int max_pstate_not_limited = -1;
static const int max_pstate_not_limited = -1;
-static simgrid::config::Flag<int>
cfg_max_pstate("plugin/dvfs/max-pstate", {"plugin/dvfs/max_pstate"},
-
"Which pstate is the maximum (and hence slowest) pstate for this governor?", max_pstate_not_limited
,
-
[](int index) {}
);
+static simgrid::config::Flag<int>
+
cfg_max_pstate("plugin/dvfs/max-pstate", {"plugin/dvfs/max_pstate"}
,
+
"Which pstate is the maximum (and hence slowest) pstate for this governor?", max_pstate_not_limited
);
/** @addtogroup SURF_plugin_load
/** @addtogroup SURF_plugin_load
@@
-254,6
+259,7
@@
public:
}
};
}
};
+#if HAVE_SMPI
class Adagio : public Governor {
private:
int best_pstate = 0;
class Adagio : public Governor {
private:
int best_pstate = 0;
@@
-270,7
+276,6
@@
public:
explicit Adagio(simgrid::s4u::Host* ptr)
: Governor(ptr), rates(100, std::vector<double>(ptr->get_pstate_count(), 0.0))
{
explicit Adagio(simgrid::s4u::Host* ptr)
: Governor(ptr), rates(100, std::vector<double>(ptr->get_pstate_count(), 0.0))
{
-#if HAVE_SMPI
simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::ActorPtr actor) {
// Every instance of this class subscribes to this event, so one per host
// This means that for any actor, all 'hosts' are normally notified of these
simgrid::smpi::plugin::ampi::on_iteration_in.connect([this](simgrid::s4u::ActorPtr actor) {
// Every instance of this class subscribes to this event, so one per host
// This means that for any actor, all 'hosts' are normally notified of these
@@
-286,7
+291,6
@@
public:
task_id = 0;
}
});
task_id = 0;
}
});
-#endif
simgrid::kernel::activity::ExecImpl::on_creation.connect([this](simgrid::kernel::activity::ExecImplPtr activity) {
if (activity->host_ == get_host())
pre_task();
simgrid::kernel::activity::ExecImpl::on_creation.connect([this](simgrid::kernel::activity::ExecImplPtr activity) {
if (activity->host_ == get_host())
pre_task();
@@
-301,7
+305,7
@@
public:
// FIXME I think that this fires at the same time for all hosts, so when the src sends something,
// the dst will be notified even though it didn't even arrive at the recv yet
simgrid::s4u::Link::on_communicate.connect(
// FIXME I think that this fires at the same time for all hosts, so when the src sends something,
// the dst will be notified even though it didn't even arrive at the recv yet
simgrid::s4u::Link::on_communicate.connect(
- [this](kernel::resource::NetworkAction*
action
, s4u::Host* src, s4u::Host* dst) {
+ [this](kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst) {
if ((get_host() == src || get_host() == dst) && iteration_running) {
post_task();
}
if ((get_host() == src || get_host() == dst) && iteration_running) {
post_task();
}
@@
-352,6
+356,7
@@
public:
virtual void update() override {}
};
virtual void update() override {}
};
+#endif
} // namespace dvfs
} // namespace plugin
} // namespace simgrid
} // namespace dvfs
} // namespace plugin
} // namespace simgrid
@@
-390,10
+395,14
@@
static void on_host_added(simgrid::s4u::Host& host)
} else if (dvfs_governor == "ondemand") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::OnDemand(daemon_proc->get_host()));
} else if (dvfs_governor == "ondemand") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::OnDemand(daemon_proc->get_host()));
- } else if (dvfs_governor == "adagio") {
+ }
+#if HAVE_SMPI
+ else if (dvfs_governor == "adagio") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::Adagio(daemon_proc->get_host()));
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::Adagio(daemon_proc->get_host()));
- } else if (dvfs_governor == "performance") {
+ }
+#endif
+ else if (dvfs_governor == "performance") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::Performance(daemon_proc->get_host()));
} else if (dvfs_governor == "powersave") {
return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
new simgrid::plugin::dvfs::Performance(daemon_proc->get_host()));
} else if (dvfs_governor == "powersave") {