From: Arnaud Giersch Date: Mon, 9 Oct 2017 13:44:43 +0000 (+0200) Subject: Rename file .cc -> .cpp. X-Git-Tag: v3.18~509^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/71c7635f30fb0ac9067f8d1e5cdab4fe992d6291?hp=-c Rename file .cc -> .cpp. --- 71c7635f30fb0ac9067f8d1e5cdab4fe992d6291 diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cpp similarity index 96% rename from src/surf/ns3/ns3_simulator.cc rename to src/surf/ns3/ns3_simulator.cpp index 55df59e5b3..7ba6d97e80 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cpp @@ -55,7 +55,7 @@ static void WriteUntilBufferFull(ns3::Ptr sock, uint32_t txSpace) uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable()}); if (toWrite == 0) // buffer full return; - int amountSent = sock->Send(0, toWrite, 0); + int amountSent = sock->Send(0, toWrite, 0); xbt_assert(amountSent > 0, "Since TxAvailable>0, amountSent should also >0"); flow->bufferedBytes_ += amountSent; @@ -113,19 +113,18 @@ void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number) sock->Connect(serverAddr); // tell the tcp implementation to call WriteUntilBufferFull again // if we blocked and new tx buffer space becomes available - sock->SetSendCallback (MakeCallback(&WriteUntilBufferFull)); + sock->SetSendCallback(MakeCallback(&WriteUntilBufferFull)); // Note when the send is over sock->SetRecvCallback(MakeCallback(&receive_callback)); // Keep track of what was used (for the TRACING module) sock->SetDataSentCallback(MakeCallback(&datasent_callback)); XBT_DEBUG("startFlow of F[%p, %p, %u] dest=%s port=%d", flow, flow->action_, flow->totalBytes_, to, port_number); - //WriteUntilBufferFull (sock, sock->GetTxAvailable ()); + // WriteUntilBufferFull (sock, sock->GetTxAvailable ()); /* sock->SetSendCallback(MakeCallback(&send_callback)); sock->SetConnectCallback(MakeCallback(&succeededConnect_callback), MakeCallback(&failedConnect_callback)); sock->SetCloseCallbacks(MakeCallback(&normalClose_callback), MakeCallback(&errorClose_callback)); send_callback(sock, sock->GetTxAvailable ()); */ - } diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5f9b6d74b9..ba462e58bf 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -303,7 +303,7 @@ if(HAVE_MMALLOC) endif() set(NS3_SRC src/surf/network_ns3.cpp - src/surf/ns3/ns3_simulator.cc ) + src/surf/ns3/ns3_simulator.cpp ) set(SURF_SRC src/kernel/routing/ClusterZone.cpp