Apparently these asserts are not failing anymore. Uncomment.

[simgrid.git] / src / surf / ns3 / ns3_simulator.cpp

diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp
index 63a0e8b..db27ef5 100644 (file)
--- a/src/surf/ns3/ns3_simulator.cpp
+++ b/src/surf/ns3/ns3_simulator.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -16,19 +16,17 @@
 
 #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
+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
 
 static void receive_callback(ns3::Ptr<ns3::Socket> socket);
 static void datasent_cb(ns3::Ptr<ns3::Socket> socket, uint32_t dataSent);
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_ns3);
 
 SgFlow::SgFlow(uint32_t totalBytes, simgrid::kernel::resource::NetworkNS3Action* action)
+    : total_bytes_(totalBytes), remaining_(totalBytes), action_(action)
 {
-  total_bytes_ = totalBytes;
-  remaining_  = totalBytes;
-  action_     = action;
 }
 
 static SgFlow* getFlowFromSocket(ns3::Ptr<ns3::Socket> socket)
@@ -48,19 +46,18 @@ static void receive_callback(ns3::Ptr<ns3::Socket> socket)
   SgFlow* flow = getFlowFromSocket(socket);
   XBT_DEBUG("received on F[%p, total: %u, remain: %u]", flow, flow->total_bytes_, flow->remaining_);
 
-  if (flow->finished_ == false) {
+  if (not flow->finished_) {
     flow->finished_ = true;
     XBT_DEBUG("recv_cb of F[%p, %p, %u]", flow, flow->action_, flow->total_bytes_);
     XBT_DEBUG("Stop simulator at %f seconds", ns3::Simulator::Now().GetSeconds());
-    ns3::Simulator::Stop(ns3::Seconds(0.0));
-    ns3::Simulator::Run();
+    ns3::Simulator::Stop();
   }
 }
 
-static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
+static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t /*txSpace*/)
 {
   SgFlow* flow = getFlowFromSocket(sock);
-  ns3::ApplicationContainer* sink = getSinkFromSocket(sock);
+  const 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)
@@ -68,15 +65,15 @@ static void send_cb(ns3::Ptr<ns3::Socket> sock, uint32_t txSpace)
 
   /* While not all is buffered and there remain space in the buffers */
   while (flow->buffered_bytes_ < flow->total_bytes_ && sock->GetTxAvailable() > 0) {
-
     // Send at most 1040 bytes (data size in a TCP packet), as ns-3 seems to not split correctly by itself
     uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable(), std::uint32_t(1040)});
+
     if (toWrite == 0) { // buffer full
       XBT_DEBUG("%f: buffer full on flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), flow,
                 flow->remaining_);
       return;
     }
-    int amountSent = sock->Send(0, toWrite, 0);
+    int amountSent = sock->Send(nullptr, toWrite, 0);
 
     xbt_assert(amountSent > 0, "Since TxAvailable>0, amountSent should also >0");
     flow->buffered_bytes_ += amountSent;
@@ -114,13 +111,13 @@ static void normalClose_callback(ns3::Ptr<ns3::Socket> socket)
   SgFlow* flow = getFlowFromSocket(socket);
   XBT_DEBUG("normalClose_cb of F[%p, %p] total: %u; sent: %u", flow, flow->action_, flow->total_bytes_,
             flow->sent_bytes_);
-  // xbt_assert(flow->total_bytes_ == flow->sent_bytes_,
-  //    "total_bytes (=%u) is not sent_bytes(=%u)", flow->total_bytes_ , flow->sent_bytes_);
-  // xbt_assert(flow->remaining_ == 0, "Remaining is not 0 but %u", flow->remaining_);
+  xbt_assert(flow->total_bytes_ == flow->sent_bytes_, "total_bytes (=%u) is not sent_bytes(=%u)", flow->total_bytes_,
+             flow->sent_bytes_);
+  xbt_assert(flow->remaining_ == 0, "Remaining is not 0 but %u", flow->remaining_);
   receive_callback(socket);
 }
 
-static void errorClose_callback(ns3::Ptr<ns3::Socket> socket)
+XBT_ATTRIB_NORETURN static void errorClose_callback(ns3::Ptr<ns3::Socket> socket)
 {
   SgFlow* flow = getFlowFromSocket(socket);
   XBT_DEBUG("errorClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->total_bytes_);
@@ -133,7 +130,7 @@ static void succeededConnect_callback(ns3::Ptr<ns3::Socket> socket)
   XBT_DEBUG("succeededConnect_cb of F[%p, %p, %u]", flow, flow->action_, flow->total_bytes_);
 }
 
-static void failedConnect_callback(ns3::Ptr<ns3::Socket> socket)
+XBT_ATTRIB_NORETURN static void failedConnect_callback(ns3::Ptr<ns3::Socket> socket)
 {
   SgFlow* mysocket = getFlowFromSocket(socket);
   XBT_DEBUG("failedConnect_cb of F[%p, %p, %u]", mysocket, mysocket->action_, mysocket->total_bytes_);