inline a signal

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

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 606da4f..4c77668 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -227,7 +227,6 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   routing_model_create(NULL);
   simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
   simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard);
-  simgrid::surf::on_link.connect(netlink_parse_init);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
   simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
 
@@ -299,7 +298,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
 
       std::vector<Link*> *route = new std::vector<Link*>();
 
-      routing_platf->getRouteAndLatency (action->srcElm_, action->dstElm_, route, NULL);
+      routing_platf->getRouteAndLatency (action->src_, action->dst_, route, NULL);
       for (auto link : *route)
         TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
       delete route;
@@ -364,11 +363,11 @@ NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetC
 {
   XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
 
-  srcElm_ = src;
-  dstElm_ = dst;
+  src_ = src;
+  dst_ = dst;
   ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
 
-  networkCommunicateCallbacks(this, src, dst, size, 0);
+  Link::onCommunicate(this, src, dst);
 }
 
 void NetworkNS3Action::suspend() {
@@ -387,10 +386,10 @@ bool NetworkNS3Action::isSuspended()
 
 int NetworkNS3Action::unref()
 {
-  m_refcount--;
-  if (!m_refcount) {
+  refcount_--;
+  if (!refcount_) {
   if (action_hook.is_linked())
-    p_stateSet->erase(p_stateSet->iterator_to(*this));
+    stateSet_->erase(stateSet_->iterator_to(*this));
     XBT_DEBUG ("Removing action %p", this);
     delete this;
     return 1;