-/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-2018. 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/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/simix.hpp"
#include "src/surf/network_interface.hpp"
+#include "surf/surf.hpp"
+
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
/** @addtogroup SURF_plugin_energy
boost::split(current_power_values, current_power_values_str, boost::is_any_of(":"));
xbt_assert(current_power_values.size() == 2,
"Power properties incorrectly defined - could not retrieve idle and busy power values for link %s",
- this->link_->getCname());
+ this->link_->get_cname());
/* min_power corresponds to the idle power (link load = 0) */
/* max_power is the power consumed at 100% link load */
- char* idleMsg = bprintf("Invalid idle power value for link%s", this->link_->getCname());
- char* busyMsg = bprintf("Invalid busy power value for %s", this->link_->getCname());
+ char* idleMsg = bprintf("Invalid idle power value for link%s", this->link_->get_cname());
+ char* busyMsg = bprintf("Invalid busy power value for %s", this->link_->get_cname());
idle_ = xbt_str_parse_double((current_power_values.at(0)).c_str(), idleMsg);
busy_ = xbt_str_parse_double((current_power_values.at(1)).c_str(), busyMsg);
using simgrid::plugin::LinkEnergy;
/* **************************** events callback *************************** */
-static void onCommunicate(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src, simgrid::s4u::Host* dst)
+static void onCommunicate(simgrid::kernel::resource::NetworkAction* action, simgrid::s4u::Host* src,
+ simgrid::s4u::Host* dst)
{
XBT_DEBUG("onCommunicate is called");
- for (simgrid::surf::LinkImpl* link : action->links()) {
+ for (simgrid::kernel::resource::LinkImpl* link : action->links()) {
if (link == nullptr)
continue;
- XBT_DEBUG("Update link %s", link->getCname());
+ XBT_DEBUG("Update link %s", link->get_cname());
LinkEnergy* link_energy = link->piface_.extension<LinkEnergy>();
link_energy->initWattsRangeList();
link_energy->update();
static void onSimulationEnd()
{
- std::vector<simgrid::s4u::Link*> links = simgrid::s4u::Engine::getInstance()->getAllLinks();
+ std::vector<simgrid::s4u::Link*> links = simgrid::s4u::Engine::get_instance()->get_all_links();
double total_energy = 0.0; // Total dissipated energy (whole platform)
for (const auto link : links) {
XBT_INFO("Total energy over all links: %f", total_energy);
}
/* **************************** Public interface *************************** */
-SG_BEGIN_DECL()
+
int sg_link_energy_is_inited()
{
return LinkEnergy::EXTENSION_ID.valid();
});
simgrid::s4u::Link::onDestruction.connect([](simgrid::s4u::Link& link) {
- if (strcmp(link.getCname(), "__loopback__"))
- XBT_INFO("Energy consumption of link '%s': %f Joules", link.getCname(),
+ if (strcmp(link.get_cname(), "__loopback__"))
+ XBT_INFO("Energy consumption of link '%s': %f Joules", link.get_cname(),
link.extension<LinkEnergy>()->getConsumedEnergy());
});
- simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::surf::NetworkAction* action) {
- for (simgrid::surf::LinkImpl* link : action->links()) {
+ simgrid::s4u::Link::onCommunicationStateChange.connect([](simgrid::kernel::resource::NetworkAction* action) {
+ for (simgrid::kernel::resource::LinkImpl* link : action->links()) {
if (link != nullptr)
link->piface_.extension<LinkEnergy>()->update();
}
});
simgrid::s4u::Link::onCommunicate.connect(&onCommunicate);
- simgrid::s4u::onSimulationEnd.connect(&onSimulationEnd);
+ simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);
}
/** @ingroup plugin_energy
{
return link->extension<LinkEnergy>()->getConsumedEnergy();
}
-SG_END_DECL()