this should allow the tracing of resource usage with this model

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 372e129..ce78407 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -234,8 +234,8 @@ void NetworkNS3Model::update_actions_state(double now, double delta)
 
       action->src_->routeTo(action->dst_, route, nullptr);
       for (auto const& link : route)
-        TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), (data_delta_sent) / delta,
-                                        now - delta, delta);
+        TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(),
+                                            (data_delta_sent) / delta, now - delta, delta);
 
       action->lastSent_ = sgFlow->sentBytes_;
     }
@@ -272,7 +272,7 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwid
   bandwidth_.peak = bandwidth;
   latency_.peak   = latency;
 
-  s4u::Link::onCreation(this->piface_);
+  s4u::Link::on_creation(this->piface_);
 }
 
 LinkNS3::~LinkNS3() = default;
@@ -328,7 +328,7 @@ NetworkNS3Action::NetworkNS3Action(kernel::resource::Model* model, double totalB
   port_number++;
   xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
 
-  s4u::Link::onCommunicate(this, src, dst);
+  s4u::Link::on_communicate(this, src, dst);
 }
 
 void NetworkNS3Action::suspend() {