Unblock the number of communications that can be done with NS-3 by

  + looping on the ports used to communicate,
  + and closing the sockets on the receiver sides (nb. the senders sockets were already closed). This point also improves the NS-3 bindings performance.

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 0dc2149..31580ea 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -17,6 +17,7 @@
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/packet-sink-helper.h>
 #include <ns3/point-to-point-helper.h>
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/packet-sink-helper.h>
 #include <ns3/point-to-point-helper.h>

+#include <ns3/application-container.h>

 
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"
 
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"


@@ -39,6 +40,7 @@ std::vector<std::string> IPV4addr;
  *****************/
 
 extern std::map<std::string, SgFlow*> flow_from_sock;
  *****************/
 
 extern std::map<std::string, SgFlow*> flow_from_sock;

+extern std::map<std::string, ns3::ApplicationContainer> sink_from_sock;

 
 static ns3::InternetStackHelper stack;
 static ns3::NodeContainer nodes;
 
 static ns3::InternetStackHelper stack;
 static ns3::NodeContainer nodes;


@@ -274,6 +276,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta)
     }
     delete flow;
     flow_from_sock.erase(ns3_socket);
     }
     delete flow;
     flow_from_sock.erase(ns3_socket);

+    sink_from_sock.erase(ns3_socket);

   }
 }
 
   }
 }
 


@@ -330,17 +333,22 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
 
   XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));
 
   XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));

-  sink.Install(dst_node);
+  ns3::ApplicationContainer apps = sink.Install(dst_node);

 
   ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
 
   flow_from_sock.insert({transform_socket_ptr(sock), new SgFlow(totalBytes, this)});
 
   ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket(src_node, ns3::TcpSocketFactory::GetTypeId());
 
   flow_from_sock.insert({transform_socket_ptr(sock), new SgFlow(totalBytes, this)});

+  sink_from_sock.insert({transform_socket_ptr(sock), apps});

 
   sock->Bind(ns3::InetSocketAddress(port_number));
 
   ns3::Simulator::ScheduleNow(&start_flow, sock, addr.c_str(), port_number);
 
   port_number++;
 
   sock->Bind(ns3::InetSocketAddress(port_number));
 
   ns3::Simulator::ScheduleNow(&start_flow, sock, addr.c_str(), port_number);
 
   port_number++;

+  if(port_number > 65000){
+    port_number = 1025;
+    XBT_WARN("Too many connections! Port number is saturated. Trying to use the oldest ports.");
+  }

   xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
 
   s4u::Link::on_communicate(*this, src, dst);
   xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated.");
 
   s4u::Link::on_communicate(*this, src, dst);

diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp
index 019ef94..63a0e8b 100644 (file)
--- a/src/surf/ns3/ns3_simulator.cpp
+++ b/src/surf/ns3/ns3_simulator.cpp
@@ -9,10 +9,15 @@
 
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/point-to-point-helper.h>
 
 #include <ns3/ipv4-address-helper.h>
 #include <ns3/point-to-point-helper.h>

+#include <ns3/application-container.h>
+#include <ns3/ptr.h>
+#include <ns3/callback.h>
+#include <ns3/packet-sink.h>

 
 #include <algorithm>
 
 std::map<std::string, SgFlow*> flow_from_sock; // ns3::sock -> SgFlow
 
 #include <algorithm>
 
 std::map<std::string, SgFlow*> flow_from_sock; // ns3::sock -> SgFlow

+std::map<std::string, ns3::ApplicationContainer> sink_from_sock; // ns3::sock -> ns3::PacketSink

 
 static void receive_callback(ns3::Ptr<ns3::Socket> socket);
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
 
 static void receive_callback(ns3::Ptr<ns3::Socket> socket);
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);


@@ -32,6 +37,12 @@ static SgFlow* getFlowFromSocket(ns3::Ptr<ns3::Socket> socket)
   return (it == flow_from_sock.end()) ? nullptr : it->second;
 }
 
   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);
 static void receive_callback(ns3::Ptr<ns3::Socket> socket)
 {
   SgFlow* flow = getFlowFromSocket(socket);


@@ -49,6 +60,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);
 static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
 {
   SgFlow* flow = getFlowFromSocket(sock);

+  ns3::ApplicationContainer* sink = getSinkFromSocket(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)
   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)


@@ -74,8 +86,18 @@ static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
               flow->remaining_);
   }
 
               flow->remaining_);
   }
 

-  if (flow->buffered_bytes_ >= flow->total_bytes_)
+  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

     sock->Close();
     sock->Close();

+  }

 }
 
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent)
 }
 
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent)


@@ -127,8 +149,6 @@ void start_flow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number
   // tell the tcp implementation to call send_cb again
   // if we blocked and new tx buffer space becomes available
   sock->SetSendCallback(MakeCallback(&send_cb));
   // tell the tcp implementation to call send_cb again
   // if we blocked and new tx buffer space becomes available
   sock->SetSendCallback(MakeCallback(&send_cb));

-  // Notice when the send is over
-  sock->SetRecvCallback(MakeCallback(&receive_callback));

   // Notice when we actually sent some data (mostly for the TRACING module)
   sock->SetDataSentCallback(MakeCallback(&datasent_cb));
 
   // Notice when we actually sent some data (mostly for the TRACING module)
   sock->SetDataSentCallback(MakeCallback(&datasent_cb));