X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e62e76d104a17f0c9aaf9135ac605e9c8c87141..f409d6f711ba652a6fd78e185791cf7870b6765d:/src/plugins/host_dvfs.cpp diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index 2466f28eb0..4c203c2d02 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -21,15 +21,19 @@ SIMGRID_REGISTER_PLUGIN(host_dvfs, "Dvfs support", &sg_host_dvfs_plugin_init) -static simgrid::config::Flag cfg_sampling_rate("plugin/dvfs/sampling-rate", {"plugin/dvfs/sampling_rate"}, - "How often should the dvfs plugin check whether the frequency needs to be changed?", 0.1, - [](double val){if (val != 0.1) sg_host_dvfs_plugin_init();}); +static simgrid::config::Flag + cfg_sampling_rate("plugin/dvfs/sampling-rate", + "How often should the dvfs plugin check whether the frequency needs to be changed?", 0.1, + [](double val) { + if (val != 0.1) + sg_host_dvfs_plugin_init(); + }); static simgrid::config::Flag cfg_governor("plugin/dvfs/governor", "Which Governor should be used that adapts the CPU frequency?", "performance", - std::map({ + std::map>({ #if HAVE_SMPI {"adagio", "TODO: Doc"}, #endif @@ -43,12 +47,12 @@ static simgrid::config::Flag cfg_governor("plugin/dvfs/governor", }); static simgrid::config::Flag - cfg_min_pstate("plugin/dvfs/min-pstate", {"plugin/dvfs/min_pstate"}, + cfg_min_pstate("plugin/dvfs/min-pstate", "Which pstate is the minimum (and hence fastest) pstate for this governor?", 0); static const int max_pstate_not_limited = -1; static simgrid::config::Flag - cfg_max_pstate("plugin/dvfs/max-pstate", {"plugin/dvfs/max_pstate"}, + cfg_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 @@ -83,19 +87,17 @@ namespace dvfs { * global configuration */ class Governor { - -private: simgrid::s4u::Host* const host_; double sampling_rate_; - int min_pstate; //< Never use a pstate less than this one - int max_pstate; //< Never use a pstate larger than this one + int min_pstate = cfg_min_pstate; //< Never use a pstate less than this one + int max_pstate = cfg_max_pstate; //< Never use a pstate larger than this one public: explicit Governor(simgrid::s4u::Host* ptr) : host_(ptr) - , min_pstate(cfg_min_pstate) - , max_pstate(cfg_max_pstate == max_pstate_not_limited ? host_->get_pstate_count() - 1 : cfg_max_pstate) { + if (cfg_max_pstate == max_pstate_not_limited) + max_pstate = host_->get_pstate_count() - 1; init(); } virtual ~Governor() = default; @@ -142,7 +144,7 @@ public: */ class Performance : public Governor { public: - explicit Performance(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "Performance"; } void update() override { get_host()->set_pstate(get_min_pstate()); } @@ -160,7 +162,7 @@ public: */ class Powersave : public Governor { public: - explicit Powersave(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "Powersave"; } void update() override { get_host()->set_pstate(get_max_pstate()); } @@ -183,7 +185,7 @@ class OnDemand : public Governor { double freq_up_threshold_ = 0.80; public: - explicit OnDemand(simgrid::s4u::Host* ptr) : Governor(ptr) {} + using Governor::Governor; std::string get_name() const override { return "OnDemand"; } void update() override @@ -231,10 +233,10 @@ class Conservative : public Governor { double freq_down_threshold_ = .2; public: - explicit Conservative(simgrid::s4u::Host* ptr) : Governor(ptr) {} - virtual std::string get_name() const override { return "Conservative"; } + using Governor::Governor; + std::string get_name() const override { return "Conservative"; } - virtual void update() override + void update() override { double load = get_host()->get_core_count() * sg_host_get_avg_load(get_host()); int pstate = get_host()->get_pstate(); @@ -299,22 +301,21 @@ public: }); simgrid::s4u::Exec::on_completion.connect([this](simgrid::s4u::Actor const&, simgrid::s4u::Exec const& activity) { // For more than one host (not yet supported), we can access the host via - // simcalls_.front()->issuer->iface()->get_host() + // simcalls_.front()->issuer->get_iface()->get_host() if (activity.get_host() == get_host() && iteration_running) { comp_timer += activity.get_finish_time() - activity.get_start_time(); } }); // 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 const&, s4u::Host* src, s4u::Host* dst) { - if ((get_host() == src || get_host() == dst) && iteration_running) { - post_task(); - } - }); + simgrid::s4u::Link::on_communicate.connect([this](const kernel::resource::NetworkAction& act) { + if ((get_host() == &act.get_src() || get_host() == &act.get_dst()) && iteration_running) { + post_task(); + } + }); } - virtual std::string get_name() const override { return "Adagio"; } + std::string get_name() const override { return "Adagio"; } void pre_task() { @@ -355,7 +356,7 @@ public: task_id++; } - virtual void update() override {} + void update() override {} }; #endif } // namespace dvfs @@ -389,35 +390,29 @@ static void on_host_added(simgrid::s4u::Host& host) boost::algorithm::to_lower(dvfs_governor); } - auto governor = [&dvfs_governor, &daemon_proc]() { + auto governor = [&dvfs_governor, &daemon_proc]() -> std::unique_ptr { if (dvfs_governor == "conservative") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Conservative(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } else if (dvfs_governor == "ondemand") { - return std::unique_ptr( - new simgrid::plugin::dvfs::OnDemand(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } #if HAVE_SMPI else if (dvfs_governor == "adagio") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Adagio(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } #endif else if (dvfs_governor == "performance") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Performance(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } else if (dvfs_governor == "powersave") { - return std::unique_ptr( - new simgrid::plugin::dvfs::Powersave(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } else { XBT_CRITICAL("No governor specified for host %s, falling back to Performance", daemon_proc->get_host()->get_cname()); - return std::unique_ptr( - new simgrid::plugin::dvfs::Performance(daemon_proc->get_host())); + return std::make_unique(daemon_proc->get_host()); } }(); - while (1) { + while (true) { // 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)