X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..ea74f5d95928a521a588737e81f1de94eef25d19:/src/plugins/link_energy.cpp?ds=sidebyside diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index a16cd8363c..e528c0d6c5 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2022. 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. */ @@ -7,10 +7,9 @@ #include "simgrid/host.h" #include "simgrid/plugins/energy.h" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/simix.hpp" -#include "src/surf/network_interface.hpp" +#include "simgrid/s4u/Link.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" #include #include @@ -46,19 +45,6 @@ namespace simgrid { namespace plugin { class LinkEnergy { -public: - static simgrid::xbt::Extension EXTENSION_ID; - - explicit LinkEnergy(simgrid::s4u::Link* ptr) : link_(ptr), last_updated_(surf_get_clock()) {} - ~LinkEnergy() = default; - - void init_watts_range_list(); - double get_consumed_energy(); - void update(); - -private: - double get_power() const; - s4u::Link* link_{}; bool inited_{false}; @@ -67,17 +53,28 @@ private: double total_energy_{0.0}; double last_updated_{0.0}; /*< Timestamp of the last energy update event*/ + + double get_power() const; + +public: + static xbt::Extension EXTENSION_ID; + + explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(simgrid::s4u::Engine::get_clock()) {} + + void init_watts_range_list(); + double get_consumed_energy(); + void update(); }; xbt::Extension LinkEnergy::EXTENSION_ID; void LinkEnergy::update() { - if (!inited_) + if (not inited_) init_watts_range_list(); double power = get_power(); - double now = surf_get_clock(); + double now = simgrid::s4u::Engine::get_clock(); total_energy_ += power * (now - last_updated_); last_updated_ = now; } @@ -127,7 +124,7 @@ void LinkEnergy::init_watts_range_list() double LinkEnergy::get_power() const { - if (!inited_) + if (not inited_) return 0.0; double power_slope = busy_ - idle_; @@ -140,7 +137,7 @@ double LinkEnergy::get_power() const double LinkEnergy::get_consumed_energy() { - if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment + if (last_updated_ < simgrid::s4u::Engine::get_clock()) // We need to simcall this as it modifies the environment kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); return this->total_energy_; } @@ -150,20 +147,6 @@ double LinkEnergy::get_consumed_energy() using simgrid::plugin::LinkEnergy; /* **************************** events callback *************************** */ -static void on_communicate(const simgrid::kernel::resource::NetworkAction& action) -{ - XBT_DEBUG("onCommunicate is called"); - for (auto const* link : action.get_links()) { - if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) - continue; - - XBT_DEBUG("Update link %s", link->get_cname()); - auto* link_energy = link->get_iface()->extension(); - link_energy->init_watts_range_list(); - link_energy->update(); - } -} - static void on_simulation_end() { std::vector links = simgrid::s4u::Engine::get_instance()->get_all_links(); @@ -179,6 +162,16 @@ static void on_simulation_end() XBT_INFO("Total energy over all links: %f", total_energy); } + +static void on_communication(const simgrid::kernel::activity::CommImpl& comm) +{ + for (auto const* link : comm.get_traversed_links()) { + if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { + XBT_DEBUG("Update %s on Comm Start/End", link->get_cname()); + link->extension()->update(); + } + } +} /* **************************** Public interface *************************** */ int sg_link_energy_is_inited() @@ -198,7 +191,7 @@ void sg_link_energy_plugin_init() xbt_assert(sg_host_count() == 0, "Please call sg_link_energy_plugin_init() before initializing the platform."); - simgrid::s4u::Link::on_creation.connect([](simgrid::s4u::Link& link) { + simgrid::s4u::Link::on_creation_cb([](simgrid::s4u::Link& link) { if (link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { XBT_DEBUG("Wired Link created: %s", link.get_cname()); link.extension_set(new LinkEnergy(&link)); @@ -207,28 +200,21 @@ void sg_link_energy_plugin_init() } }); - simgrid::s4u::Link::on_state_change.connect([](simgrid::s4u::Link const& link) { + simgrid::s4u::Link::on_state_change_cb([](simgrid::s4u::Link const& link) { if (link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) link.extension()->update(); }); - simgrid::s4u::Link::on_destruction.connect([](simgrid::s4u::Link const& link) { + simgrid::s4u::Link::on_destruction_cb([](simgrid::s4u::Link const& link) { if (link.get_name() != "__loopback__" && link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) XBT_INFO("Energy consumption of link '%s': %f Joules", link.get_cname(), link.extension()->get_consumed_energy()); }); - simgrid::s4u::Link::on_communication_state_change.connect( - [](simgrid::kernel::resource::NetworkAction const& action, - simgrid::kernel::resource::Action::State /* previous */) { - for (auto const* link : action.get_links()) { - if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) - link->get_iface()->extension()->update(); - } - }); - - simgrid::s4u::Link::on_communicate.connect(&on_communicate); - simgrid::s4u::Engine::on_simulation_end.connect(&on_simulation_end); + simgrid::kernel::activity::CommImpl::on_start.connect(&on_communication); + simgrid::kernel::activity::CommImpl::on_completion.connect(&on_communication); + + simgrid::s4u::Engine::on_simulation_end_cb(&on_simulation_end); } /** @ingroup plugin_link_energy