From 6c930c685c64eb5bcf2e73ba17bbeddc8fe19a74 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 31 Jul 2017 01:58:34 +0200 Subject: [PATCH] fix NS3 builds --- src/surf/network_ns3.cpp | 8 ++++---- src/surf/ns3/ns3_simulator.cc | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index b2e8eaf79b..fb0f9cc7d2 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -353,7 +353,7 @@ void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, xbt_assert(addr != nullptr, "Element %s is unknown to NS3. Is it connected to any one-hop link?", dst->pimpl_netpoint->cname()); - XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr); + XBT_DEBUG("ns3_create_flow %u Bytes from %u to %u with Interface %s", TotalBytes, node1, node2, addr); ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number)); sink.Install (dst_node); @@ -407,11 +407,11 @@ void ns3_add_cluster(const char* id, double bw, double lat) { for (unsigned int i = number_of_clusters_nodes; i < Cluster_nodes.GetN(); i++) { Nodes.Add(Cluster_nodes.Get(i)); - XBT_DEBUG("Add node %d to cluster",i); + XBT_DEBUG("Add node %u to cluster", i); } number_of_clusters_nodes = Cluster_nodes.GetN(); - XBT_DEBUG("Add router %d to cluster",nodes.GetN()-Nodes.GetN()-1); + XBT_DEBUG("Add router %u to cluster", nodes.GetN() - Nodes.GetN() - 1); Nodes.Add(nodes.Get(nodes.GetN()-Nodes.GetN()-1)); xbt_assert(Nodes.GetN() <= 65000, "Cluster with NS3 is limited to 65000 nodes"); @@ -435,7 +435,7 @@ void ns3_add_cluster(const char* id, double bw, double lat) { }else{ number_of_links++; } - XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN()); + XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN()); } static char* transformIpv4Address (ns3::Ipv4Address from){ diff --git a/src/surf/ns3/ns3_simulator.cc b/src/surf/ns3/ns3_simulator.cc index b27b852bdd..e675094a85 100644 --- a/src/surf/ns3/ns3_simulator.cc +++ b/src/surf/ns3/ns3_simulator.cc @@ -37,7 +37,7 @@ static void receive_callback(ns3::Ptr socket) if (flow->finished_ == false) { flow->finished_ = true; - XBT_DEBUG("recv_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("recv_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); XBT_DEBUG("Stop simulator at %f seconds", ns3::Simulator::Now().GetSeconds()); ns3::Simulator::Stop(ns3::Seconds(0.0)); ns3::Simulator::Run(); @@ -63,8 +63,8 @@ static void WriteUntilBufferFull(ns3::Ptr sock, uint32_t txSpace) flow->bufferedBytes_ += amountSent; flow->remaining_ -= amountSent; - XBT_DEBUG("%f: sent %d bytes over flow %p (still %d to go)", - ns3::Simulator::Now().GetSeconds(), amountSent, flow, flow->remaining_); + 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_) @@ -76,34 +76,34 @@ static void datasent_callback(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, %d] %d sent (%d total)", - flow, flow->action_, flow->totalBytes_, dataSent, flow->sentBytes_); + XBT_DEBUG("datasent_cb of F[%p, %p, %u] %u sent (%u total)", flow, flow->action_, flow->totalBytes_, dataSent, + flow->sentBytes_); } static void normalClose_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("normalClose_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("normalClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); receive_callback(socket); } static void errorClose_callback(ns3::Ptr socket) { SgFlow* flow = getFlowFromSocket(socket); - XBT_DEBUG("errorClose_cb of F[%p, %p, %d]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("errorClose_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); 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, %d]", flow, flow->action_, flow->totalBytes_); + XBT_DEBUG("succeededConnect_cb of F[%p, %p, %u]", flow, flow->action_, flow->totalBytes_); } static void failedConnect_callback(ns3::Ptr socket) { SgFlow* mysocket = getFlowFromSocket(socket); - XBT_DEBUG("failedConnect_cb of F[%p, %p, %d]", mysocket, mysocket->action_, mysocket->totalBytes_); + XBT_DEBUG("failedConnect_cb of F[%p, %p, %u]", mysocket, mysocket->action_, mysocket->totalBytes_); xbt_die("NS3: a socket failed to connect"); } @@ -120,7 +120,7 @@ void StartFlow(ns3::Ptr sock, const char* to, uint16_t port_number) 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, %d] 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->totalBytes_, to, port_number); //WriteUntilBufferFull (sock, sock->GetTxAvailable ()); /* -- 2.20.1