/* 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 "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Link.hpp"
+#include <simgrid/plugins/energy.h>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Link.hpp>
+
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/network_wifi.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/config.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <map>
SIMGRID_REGISTER_PLUGIN(link_energy_wifi, "Energy wifi test", &sg_wifi_energy_plugin_init);
/** @defgroup plugin_link_energy_wifi Plugin WiFi energy
LinkEnergyWifi() = delete;
/** Update the energy consumed by link_ when transmissions start or end */
- void update(const simgrid::kernel::resource::NetworkAction &);
+ void update();
/** Update the energy consumed when link_ is destroyed */
void update_destroy();
void LinkEnergyWifi::update_destroy()
{
auto const* wifi_link = static_cast<kernel::resource::NetworkWifiLink*>(link_->get_impl());
- double duration = surf_get_clock() - prev_update_;
- prev_update_ = surf_get_clock();
+ double duration = simgrid::s4u::Engine::get_clock() - prev_update_;
+ prev_update_ = simgrid::s4u::Engine::get_clock();
dur_idle_ += duration;
XBT_DEBUG("finish eStat_ += %f * %f * (%d+1) | eStat = %f", duration, pIdle_, wifi_link->get_host_count(), eStat_);
}
-void LinkEnergyWifi::update(const kernel::resource::NetworkAction&)
+void LinkEnergyWifi::update()
{
init_watts_range_list();
- double duration = surf_get_clock() - prev_update_;
- prev_update_ = surf_get_clock();
+ double duration = simgrid::s4u::Engine::get_clock() - prev_update_;
+ prev_update_ = simgrid::s4u::Engine::get_clock();
// we don't update for null durations
if(duration < 1e-6)
double durUsage = 0;
while (const auto* var = wifi_link->get_constraint()->get_variable(&elem)) {
auto* action = static_cast<kernel::resource::NetworkWifiAction*>(var->get_id());
- XBT_DEBUG("cost: %f action value: %f link rate 1: %f link rate 2: %f", action->get_cost(),
- action->get_variable()->get_value(), wifi_link->get_host_rate(&action->get_src()),
- wifi_link->get_host_rate(&action->get_dst()));
+ XBT_DEBUG("cost: %f action value: %f link rate 1: %f link rate 2: %f", action->get_cost(), action->get_rate(),
+ wifi_link->get_host_rate(&action->get_src()), wifi_link->get_host_rate(&action->get_dst()));
- if (action->get_variable()->get_value() != 0.0) {
+ if (action->get_rate() != 0.0) {
auto it = flowTmp.find(action);
// if the flow has not been registered, initialize it: 0 bytes sent, and not updated since its creation timestamp
* If this is longer than the duration since the previous update, active duration = now - previous_update
*/
double du = // durUsage on the current flow
- (action->get_cost() - it->second.first) / action->get_variable()->get_value();
+ (action->get_cost() - it->second.first) / action->get_rate();
- if(du > surf_get_clock()-it->second.second)
- du = surf_get_clock()-it->second.second;
+ if (du > simgrid::s4u::Engine::get_clock() - it->second.second)
+ du = simgrid::s4u::Engine::get_clock() - it->second.second;
// if the flow has been more active than the others
if(du > durUsage)
durUsage = du;
// update the amount of data already sent by the flow
- it->second.first += du*action->get_variable()->get_value();
- it->second.second = surf_get_clock();
+ it->second.first += du * action->get_rate();
+ it->second.second = simgrid::s4u::Engine::get_clock();
// important: if the transmission finished, remove it (needed for performance and multi-message flows)
if(it->second.first >= action->get_cost())
} // namespace simgrid
using simgrid::plugin::LinkEnergyWifi;
+/* **************************** events callback *************************** */
+static void on_communication(const simgrid::kernel::activity::CommImpl& comm)
+{
+ for (const auto* link : comm.get_traversed_links()) {
+ if (link != nullptr && link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) {
+ auto* link_energy = link->extension<LinkEnergyWifi>();
+ XBT_DEBUG("Update %s on Comm Start/End", link->get_cname());
+ link_energy->update();
+ }
+ }
+}
void sg_wifi_energy_plugin_init()
{
/**
* Attaching to events:
- * - on_creation to initialize the plugin
- * - on_destruction to produce final energy results
- * - on_communication_state_change: to account the energy when communications are updated
- * - on_communicate: ''
+ * - Link::on_creation to initialize the plugin
+ * - Link::on_destruction to produce final energy results
+ * - Link::on_communication_state_change: to account for the energy when communications are updated
+ * - CommImpl::on_start and CommImpl::on_completion: to account for the energy during communications
*/
simgrid::s4u::Link::on_creation.connect([](simgrid::s4u::Link& link) {
// verify the link is appropriate to WiFi energy computations
// update WiFi links encountered during the communication
for (auto const* link : action.get_links()) {
if (link != nullptr && link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) {
- link->get_iface()->extension<LinkEnergyWifi>()->update(action);
+ link->get_iface()->extension<LinkEnergyWifi>()->update();
}
}
});
- simgrid::s4u::Link::on_communicate.connect([](const simgrid::kernel::resource::NetworkAction& action) {
- auto const* actionWifi = dynamic_cast<const simgrid::kernel::resource::NetworkWifiAction*>(&action);
-
- if (actionWifi == nullptr)
- return;
-
- auto const* link_src = actionWifi->get_src_link();
- auto const* link_dst = actionWifi->get_dst_link();
-
- if(link_src != nullptr)
- link_src->get_iface()->extension<LinkEnergyWifi>()->update(action);
- if(link_dst != nullptr)
- link_dst->get_iface()->extension<LinkEnergyWifi>()->update(action);
- });
+ simgrid::kernel::activity::CommImpl::on_start.connect(&on_communication);
+ simgrid::kernel::activity::CommImpl::on_completion.connect(&on_communication);
}