X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9fb9c3b94a08a8a49509e49e3dc847f6c215b99..630f6085be5dfa41c4fee13930e8a87026a75d78:/src/plugins/link_energy.cpp diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index b2b5e10089..5fa3a824f0 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2017-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ +#include "simgrid/Exception.hpp" #include "simgrid/plugins/energy.h" #include "simgrid/s4u/Engine.hpp" #include "src/surf/network_interface.hpp" @@ -14,7 +15,7 @@ SIMGRID_REGISTER_PLUGIN(link_energy, "Link energy consumption.", &sg_link_energy_plugin_init) -/** @defgroup plugin_link_energy +/** @defgroup plugin_link_energy Plugin Link Energy This is the link energy plugin, accounting for the dissipated energy in the simulated platform. @@ -33,8 +34,7 @@ SIMGRID_REGISTER_PLUGIN(link_energy, "Link energy consumption.", &sg_link_energy The second property means that when your host is turned off, it will dissipate only 10 Watts (please note that these values are arbitrary). - To simulate the energy-related elements, first call the simgrid#energy#sg_link_energy_plugin_init() before your - #MSG_init(), + To simulate the energy-related elements, first call the sg_link_energy_plugin_init() before loading the platform and then use the following function to retrieve the consumption of a given link: sg_link_get_consumed_energy(). */ @@ -57,7 +57,7 @@ public: private: double get_power(); - simgrid::s4u::Link* link_{}; + s4u::Link* link_{}; bool inited_{false}; double idle_{0.0}; @@ -67,7 +67,7 @@ private: double last_updated_{0.0}; /*< Timestamp of the last energy update event*/ }; -simgrid::xbt::Extension LinkEnergy::EXTENSION_ID; +xbt::Extension LinkEnergy::EXTENSION_ID; void LinkEnergy::update() { @@ -125,7 +125,6 @@ void LinkEnergy::init_watts_range_list() double LinkEnergy::get_power() { - if (!inited_) return 0.0; @@ -140,7 +139,7 @@ double LinkEnergy::get_power() double LinkEnergy::get_consumed_energy() { if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment - simgrid::kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); + kernel::actor::simcall(std::bind(&LinkEnergy::update, this)); return this->total_energy_; } } // namespace plugin @@ -149,13 +148,12 @@ double LinkEnergy::get_consumed_energy() using simgrid::plugin::LinkEnergy; /* **************************** events callback *************************** */ -static void on_communicate(simgrid::kernel::resource::NetworkAction const& action, simgrid::s4u::Host*, - simgrid::s4u::Host*) +static void on_communicate(const simgrid::kernel::resource::NetworkAction& action, const simgrid::s4u::Host*, + const simgrid::s4u::Host*) { XBT_DEBUG("onCommunicate is called"); for (simgrid::kernel::resource::LinkImpl* link : action.links()) { - - if (link == nullptr) + if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) continue; XBT_DEBUG("Update link %s", link->get_cname()); @@ -171,6 +169,9 @@ static void on_simulation_end() double total_energy = 0.0; // Total dissipated energy (whole platform) for (const auto link : links) { + if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) + continue; + double link_energy = link->extension()->get_consumed_energy(); total_energy += link_energy; } @@ -186,7 +187,7 @@ int sg_link_energy_is_inited() /** @ingroup plugin_link_energy * @brief Enable energy plugin * @details Enable energy plugin to get joules consumption of each cpu. You should call this function before - * #MSG_init(). + * loading your platform. */ void sg_link_energy_plugin_init() { @@ -196,13 +197,22 @@ 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) { link.extension_set(new LinkEnergy(&link)); }); + simgrid::s4u::Link::on_creation.connect([](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)); + } else { + XBT_DEBUG("Not Wired link: %s", link.get_cname()); + } + }); - simgrid::s4u::Link::on_state_change.connect( - [](simgrid::s4u::Link const& link) { link.extension()->update(); }); + simgrid::s4u::Link::on_state_change.connect([](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) { - if (link.get_name() != "__loopback__") + 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()); }); @@ -210,7 +220,7 @@ void sg_link_energy_plugin_init() simgrid::s4u::Link::on_communication_state_change.connect([]( simgrid::kernel::resource::NetworkAction const& action, simgrid::kernel::resource::Action::State /* previous */) { for (simgrid::kernel::resource::LinkImpl* link : action.links()) { - if (link != nullptr) + if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) link->get_iface()->extension()->update(); } }); @@ -226,10 +236,10 @@ void sg_link_energy_plugin_init() * The result is that the actor requesting this value will be interrupted, * the value will be updated in kernel mode before returning the control to the requesting actor. */ -double sg_link_get_consumed_energy(sg_link_t link) +double sg_link_get_consumed_energy(const_sg_link_t link) { if (not LinkEnergy::EXTENSION_ID.valid()) - throw std::logic_error("The Energy plugin is not active. Please call sg_link_energy_plugin_init() before calling " - "sg_link_get_consumed_energy()."); + throw simgrid::xbt::InitializationError("The Energy plugin is not active. Please call sg_link_energy_plugin_init() " + "before calling sg_link_get_consumed_energy()."); return link->extension()->get_consumed_energy(); }