#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
+#include "src/surf/xml/platf_private.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
* Callbacks *
*************/
-static void clusterCreation_cb(ClusterCreationArgs* cluster)
+static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs* cluster)
{
for (int const& i : *cluster->radicals) {
// Routers don't create a router on the other end of the private link by themselves.
SgFlow* sgFlow = elm.second;
NetworkNS3Action * action = sgFlow->action_;
XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
- action->setRemains(action->getCost() - sgFlow->sentBytes_);
+ action->set_remains(action->get_cost() - sgFlow->sentBytes_);
- if (TRACE_is_enabled() && action->getState() == kernel::resource::Action::State::running) {
+ if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::running) {
double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
action->src_->routeTo(action->dst_, route, nullptr);
for (auto const& link : route)
- TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta,
- delta);
+ TRACE_surf_link_set_utilization(link->getCname(), action->get_category(), (data_delta_sent) / delta,
+ now - delta, delta);
action->lastSent_ = sgFlow->sentBytes_;
}
{
THROW_UNIMPLEMENTED;
}
+void NetworkNS3Action::updateRemainingLazy(double /*now*/)
+{
+ THROW_IMPOSSIBLE;
+}
/* Test whether a flow is suspended */
bool NetworkNS3Action::isSuspended()
{
refcount_--;
if (not refcount_) {
- if (stateSetHook_.is_linked())
- simgrid::xbt::intrusive_erase(*stateSet_, *this);
+ if (state_set_hook_.is_linked())
+ simgrid::xbt::intrusive_erase(*state_set_, *this);
XBT_DEBUG ("Removing action %p", this);
delete this;
return 1;