no need to save all ns3 sink points

diff --git a/src/kernel/resource/models/network_ns3.cpp b/src/kernel/resource/models/network_ns3.cpp
index 2d31693..0ba9186 100644 (file)
--- a/src/kernel/resource/models/network_ns3.cpp
+++ b/src/kernel/resource/models/network_ns3.cpp
@@ -50,7 +50,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns
  *****************/
 
 extern std::map<std::string, SgFlow*, std::less<>> flow_from_sock;
-extern std::map<std::string, ns3::ApplicationContainer, std::less<>> sink_from_sock;
 
 static int number_of_links    = 1;
 static int number_of_networks = 1;
@@ -508,7 +507,6 @@ void NetworkNS3Model::update_actions_state(double now, double delta)
     }
     delete flow;
     flow_from_sock.erase(ns3_socket);
-    sink_from_sock.erase(ns3_socket);
   }
 }
 
@@ -586,7 +584,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
              dst->get_netpoint()->get_cname());
 
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));
-  ns3::ApplicationContainer apps = sink.Install(dst_node);
+  sink.Install(dst_node);
 
   ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
 
@@ -595,7 +593,6 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
             src->get_cname(), dst->get_cname(), addr.c_str());
 
   flow_from_sock.try_emplace(sock_addr, new SgFlow(static_cast<uint32_t>(totalBytes), this));
-  sink_from_sock.try_emplace(sock_addr, apps);
 
   sock->Bind(ns3::InetSocketAddress(port_number));
 
@@ -629,8 +626,9 @@ void NetworkNS3Action::update_remains_lazy(double /*now*/)
 
 ns3::Ptr<ns3::Node> get_ns3node_from_sghost(const simgrid::s4u::Host* host)
 {
-  xbt_assert(host->get_netpoint()->extension<NetPointNs3>() != nullptr, "Please only use this function on ns-3 nodes");
-  return host->get_netpoint()->extension<NetPointNs3>()->ns3_node_;
+  auto* netext = host->get_netpoint()->extension<NetPointNs3>();
+  xbt_assert(netext != nullptr, "Please only use this function on ns-3 nodes");
+  return netext->ns3_node_;
 }
 } // namespace simgrid
 

diff --git a/src/kernel/resource/models/ns3/ns3_simulator.cpp b/src/kernel/resource/models/ns3/ns3_simulator.cpp
index 72cdaa1..bbc6206 100644 (file)
--- a/src/kernel/resource/models/ns3/ns3_simulator.cpp
+++ b/src/kernel/resource/models/ns3/ns3_simulator.cpp
@@ -17,8 +17,7 @@
 
 #include <algorithm>
 
-std::map<std::string, SgFlow*, std::less<>> flow_from_sock;                   // ns3::sock -> SgFlow
-std::map<std::string, ns3::ApplicationContainer, std::less<>> sink_from_sock; // ns3::sock -> ns3::PacketSink
+std::map<std::string, SgFlow*, std::less<>> flow_from_sock; // ns3::sock -> SgFlow
 
 static void receive_callback(ns3::Ptr<ns3::Socket> socket);
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
@@ -31,12 +30,6 @@ static SgFlow* getFlowFromSocket(ns3::Ptr<ns3::Socket> socket)
   return (it == flow_from_sock.end()) ? nullptr : it->second;
 }
 
-static ns3::ApplicationContainer* getSinkFromSocket(ns3::Ptr<ns3::Socket> socket)
-{
-  auto it = sink_from_sock.find(transform_socket_ptr(socket));
-  return (it == sink_from_sock.end()) ? nullptr : &(it->second);
-}
-
 static void receive_callback(ns3::Ptr<ns3::Socket> socket)
 {
   SgFlow* flow = getFlowFromSocket(socket);
@@ -52,8 +45,7 @@ static void receive_callback(ns3::Ptr<ns3::Socket> socket)
 
 static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t /*txSpace*/)
 {
-  SgFlow* flow                          = getFlowFromSocket(sock);
-  const ns3::ApplicationContainer* sink = getSinkFromSocket(sock);
+  SgFlow* flow = getFlowFromSocket(sock);
   XBT_DEBUG("Asked to write on F[%p, total: %u, remain: %u]", flow, flow->total_bytes_, flow->remaining_);
 
   if (flow->remaining_ == 0) // all data was already buffered (and socket was already closed)
@@ -80,15 +72,7 @@ static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t /*txSpace*/)
   }
 
   if (flow->buffered_bytes_ >= flow->total_bytes_) {
-    XBT_DEBUG("Closing Sockets of flow %p", flow);
-    // Closing the sockets of the receiving application
-    ns3::Ptr<ns3::PacketSink> app        = ns3::DynamicCast<ns3::PacketSink, ns3::Application>(sink->Get(0));
-    ns3::Ptr<ns3::Socket> listening_sock = app->GetListeningSocket();
-    listening_sock->Close();
-    listening_sock->SetRecvCallback(ns3::MakeNullCallback<void, ns3::Ptr<ns3::Socket>>());
-    for (ns3::Ptr<ns3::Socket> accepted_sock : app->GetAcceptedSockets())
-      accepted_sock->Close();
-    // Closing the socket of the sender
+    XBT_DEBUG("Closing sender's socket of flow %p", flow);
     sock->Close();
   }
 }