X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..fdab189916cad1bf47afa4f3c272c8ba26c36ed1:/src/surf/ns3/ns3_simulator.cpp diff --git a/src/surf/ns3/ns3_simulator.cpp b/src/surf/ns3/ns3_simulator.cpp index 64230a0038..19297c65d7 100644 --- a/src/surf/ns3/ns3_simulator.cpp +++ b/src/surf/ns3/ns3_simulator.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. 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. */ @@ -12,7 +12,7 @@ #include -std::map flowFromSock; // ns3::sock -> SgFlow +std::map flow_from_sock; // ns3::sock -> SgFlow static void receive_callback(ns3::Ptr socket); static void datasent_cb(ns3::Ptr socket, uint32_t dataSent); @@ -21,25 +21,25 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3); SgFlow::SgFlow(uint32_t totalBytes, simgrid::kernel::resource::NetworkNS3Action* action) { - totalBytes_ = totalBytes; + total_bytes_ = totalBytes; remaining_ = totalBytes; action_ = action; } static SgFlow* getFlowFromSocket(ns3::Ptr socket) { - auto it = flowFromSock.find(transformSocketPtr(socket)); - return (it == flowFromSock.end()) ? nullptr : it->second; + auto it = flow_from_sock.find(transform_socket_ptr(socket)); + return (it == flow_from_sock.end()) ? nullptr : it->second; } static void receive_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("received on F[%p, total: %u, remain: %u]", flow, flow->totalBytes_, flow->remaining_); + XBT_DEBUG("received on F[%p, total: %u, remain: %u]", flow, flow->total_bytes_, flow->remaining_); if (flow->finished_ == false) { flow->finished_ = true; - XBT_DEBUG("recv_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); + 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(); @@ -49,13 +49,13 @@ static void receive_callback(ns3::Ptr socket) static void send_cb(ns3::Ptr sock, uint32_t txSpace) { SgFlow* flow = getFlowFromSocket(sock); - XBT_DEBUG("Asked to write on F[%p, total: %u, remain: %u]", flow, flow->totalBytes_, flow->remaining_); + 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) return; /* While not all is buffered and there remain space in the buffers */ - while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) { + while (flow->buffered_bytes_ < flow->total_bytes_ && sock->GetTxAvailable() > 0) { // Send at most 1040 bytes (data size in a TCP packet), as NS3 seems to not split correctly by itself uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable(), std::uint32_t(1040)}); @@ -67,14 +67,14 @@ static void send_cb(ns3::Ptr sock, uint32_t txSpace) int amountSent = sock->Send(0, toWrite, 0); xbt_assert(amountSent > 0, "Since TxAvailable>0, amountSent should also >0"); - flow->bufferedBytes_ += amountSent; + flow->buffered_bytes_ += amountSent; flow->remaining_ -= amountSent; XBT_DEBUG("%f: sent %d bytes over flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), amountSent, flow, flow->remaining_); } - if (flow->bufferedBytes_ >= flow->totalBytes_) + if (flow->buffered_bytes_ >= flow->total_bytes_) sock->Close(); } @@ -82,39 +82,43 @@ static void datasent_cb(ns3::Ptr socket, uint32_t dataSent) { /* The tracing wants to know */ SgFlow* flow = getFlowFromSocket(socket); - flow->sentBytes_ += dataSent; - XBT_DEBUG("datasent_cb of F[%p, %p, %u] %u sent (%u total)", flow, flow->action_, flow->totalBytes_, dataSent, - flow->sentBytes_); + flow->sent_bytes_ += dataSent; + XBT_DEBUG("datasent_cb of F[%p, %p, %u] %u sent (%u total)", flow, flow->action_, flow->total_bytes_, dataSent, + flow->sent_bytes_); } static void normalClose_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("normalClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); + 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_); receive_callback(socket); } static void errorClose_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("errorClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("errorClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->total_bytes_); xbt_die("NS3: a socket was closed anormally"); } static void succeededConnect_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("succeededConnect_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("succeededConnect_cb of F[%p, %p, %u]", flow, flow->action_, flow->total_bytes_); } static void failedConnect_callback(ns3::Ptr socket) { SgFlow* mysocket = getFlowFromSocket(socket); - XBT_DEBUG("failedConnect_cb of F[%p, %p, %u]", mysocket, mysocket->action_, mysocket->totalBytes_); + XBT_DEBUG("failedConnect_cb of F[%p, %p, %u]", mysocket, mysocket->action_, mysocket->total_bytes_); xbt_die("NS3: a socket failed to connect"); } -void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number) +void start_flow(ns3::Ptr sock, const char* to, uint16_t port_number) { SgFlow* flow = getFlowFromSocket(sock); ns3::InetSocketAddress serverAddr(to, port_number); @@ -128,7 +132,7 @@ void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number) // Notice when we actually sent some data (mostly for the TRACING module) sock->SetDataSentCallback(MakeCallback(&datasent_cb)); - XBT_DEBUG("startFlow of F[%p, %p, %u] dest=%s port=%d", flow, flow->action_, flow->totalBytes_, to, port_number); + XBT_DEBUG("startFlow of F[%p, %p, %u] dest=%s port=%d", flow, flow->action_, flow->total_bytes_, to, port_number); sock->SetConnectCallback(MakeCallback(&succeededConnect_callback), MakeCallback(&failedConnect_callback)); sock->SetCloseCallbacks(MakeCallback(&normalClose_callback), MakeCallback(&errorClose_callback));