Merge branch 'master' of framagit.org:Adrien.Gougeon/simgrid

[simgrid.git] / src / plugins / host_dvfs.cpp

diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index 8082018af36c78792ca764229ab62e1eb47fc1b4..82c38aa7281bc4c700badd269871b784d8b579f1 100644 (file)
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -297,7 +297,7 @@ 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();
       }
@@ -386,31 +386,25 @@ 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<simgrid::plugin::dvfs::Governor> {
       if (dvfs_governor == "conservative") {
-        return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
-            new simgrid::plugin::dvfs::Conservative(daemon_proc->get_host()));
+        return std::make_unique<simgrid::plugin::dvfs::Conservative>(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()));
+        return std::make_unique<simgrid::plugin::dvfs::OnDemand>(daemon_proc->get_host());
       }
 #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::make_unique<simgrid::plugin::dvfs::Adagio>(daemon_proc->get_host());
       }
 #endif
       else if (dvfs_governor == "performance") {
-        return std::unique_ptr<simgrid::plugin::dvfs::Governor>(
-            new simgrid::plugin::dvfs::Performance(daemon_proc->get_host()));
+        return std::make_unique<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::Powersave(daemon_proc->get_host()));
+        return std::make_unique<simgrid::plugin::dvfs::Powersave>(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<simgrid::plugin::dvfs::Governor>(
-            new simgrid::plugin::dvfs::Performance(daemon_proc->get_host()));
+        return std::make_unique<simgrid::plugin::dvfs::Performance>(daemon_proc->get_host());
       }
     }();