X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/acb292ef96c6533590b4adcfb7c6187f798f0f39..bd76919be169a04d524d59aaad0698411793a410:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 0272a646c6..7c300951cf 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -3,9 +3,11 @@ /* 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. */ +#include #include #include "xbt/config.hpp" +#include "xbt/string.hpp" #include "ns3/core-module.h" #include "ns3/node.h" @@ -21,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module"); -std::vector IPV4addr; +std::vector IPV4addr; /***************** * Crude globals * @@ -79,10 +81,10 @@ static void clusterCreation_cb(ClusterCreationArgs* cluster) static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src, simgrid::kernel::routing::NetPoint* gw_dst, - std::vector* link_list) + std::vector& link_list) { - if (link_list->size() == 1) { - simgrid::surf::LinkNS3* link = static_cast(link_list->at(0)); + if (link_list.size() == 1) { + simgrid::surf::LinkNS3* link = static_cast(link_list[0]); XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->getCname(), dst->getCname(), link->getCname(), (symmetrical ? "(symmetrical)" : "(not symmetrical)")); @@ -107,7 +109,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin "of length 1.\n" "WARNING: Remove long routes to avoid this harmless message; subsequent long routes will be silently " "ignored.", - src->getCname(), dst->getCname(), link_list->size()); + src->getCname(), dst->getCname(), link_list.size()); warned_about_long_routes = true; } } @@ -133,8 +135,8 @@ void surf_network_model_init_NS3() all_existing_models->push_back(surf_network_model); } -static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", - "The ns3 tcp model can be : NewReno or Reno or Tahoe", "NewReno"); +static simgrid::config::Flag + ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default"); namespace simgrid { namespace surf { @@ -151,15 +153,9 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() { simgrid::surf::on_cluster.connect(&clusterCreation_cb); simgrid::s4u::onPlatformCreated.connect(&postparse_cb); simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb); - - LogComponentEnable("PacketSink", ns3::LOG_LEVEL_INFO); - LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); - LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO); } NetworkNS3Model::~NetworkNS3Model() { - for (auto const& addr : IPV4addr) - free(addr); IPV4addr.clear(); } @@ -223,7 +219,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) std::vector route = std::vector(); - action->src_->routeTo(action->dst_, &route, nullptr); + action->src_->routeTo(action->dst_, route, nullptr); for (auto const& link : route) TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), (data_delta_sent) / delta, now - delta, delta); @@ -346,11 +342,11 @@ void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to NS3. Is it connected to any one-hop link?", dst->pimpl_netpoint->getCname()); - char* addr = IPV4addr.at(node2); - xbt_assert(addr != nullptr, "Element %s is unknown to NS3. Is it connected to any one-hop link?", + std::string& addr = IPV4addr[node2]; + xbt_assert(not addr.empty(), "Element %s is unknown to NS3. Is it connected to any one-hop link?", dst->pimpl_netpoint->getCname()); - XBT_DEBUG("ns3_create_flow %u Bytes from %u to %u 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.c_str()); ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number)); sink.Install (dst_node); @@ -360,7 +356,7 @@ void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, sock->Bind(ns3::InetSocketAddress(port_number)); - ns3::Simulator::ScheduleNow(&StartFlow, sock, addr, port_number); + ns3::Simulator::ScheduleNow(&StartFlow, sock, addr.c_str(), port_number); port_number++; xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); @@ -418,11 +414,10 @@ void ns3_add_cluster(const char* id, double bw, double lat) { ns3::NetDeviceContainer devices = csma.Install(Nodes); XBT_DEBUG("Create CSMA"); - char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links); - XBT_DEBUG("Assign IP Addresses %s to CSMA.",adr); + std::string addr = simgrid::xbt::string_printf("%d.%d.0.0", number_of_networks, number_of_links); + XBT_DEBUG("Assign IP Addresses %s to CSMA.", addr.c_str()); ns3::Ipv4AddressHelper ipv4; - ipv4.SetBase (adr, "255.255.0.0"); - free(adr); + ipv4.SetBase(addr.c_str(), "255.255.0.0"); interfaces.Add(ipv4.Assign (devices)); if(number_of_links == 255){ @@ -435,11 +430,11 @@ void ns3_add_cluster(const char* id, double bw, double lat) { XBT_DEBUG("Number of nodes in Cluster_nodes: %u", Cluster_nodes.GetN()); } -static char* transformIpv4Address (ns3::Ipv4Address from){ +static std::string transformIpv4Address(ns3::Ipv4Address from) +{ std::stringstream sstream; sstream << from ; - std::string s = sstream.str(); - return bprintf("%s",s.c_str()); + return sstream.str(); } void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { @@ -457,28 +452,26 @@ void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { pointToPoint.SetDeviceAttribute("DataRate", ns3::DataRateValue(ns3::DataRate(bw*8)));// NS3 takes bps, but we provide Bps pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat))); - char *filename = bprintf("link-%d-%d.tr", srcNum, dstNum); + std::string filename = simgrid::xbt::string_printf("link-%d-%d.tr", srcNum, dstNum); ns3::AsciiTraceHelper ascii; - pointToPoint.EnableAsciiAll (ascii.CreateFileStream (filename)); + pointToPoint.EnableAsciiAll(ascii.CreateFileStream(filename)); pointToPoint.EnablePcapAll ("tcp-bulk-send", false); - xbt_free(filename); ns3::NetDeviceContainer netA; netA.Add(pointToPoint.Install (a, b)); - char * adr = bprintf("%d.%d.0.0",number_of_networks,number_of_links); - address.SetBase (adr, "255.255.0.0"); - XBT_DEBUG("\tInterface stack '%s'",adr); - free(adr); + std::string addr = simgrid::xbt::string_printf("%d.%d.0.0", number_of_networks, number_of_links); + address.SetBase(addr.c_str(), "255.255.0.0"); + XBT_DEBUG("\tInterface stack '%s'", addr.c_str()); interfaces.Add(address.Assign (netA)); if (IPV4addr.size() <= (unsigned)srcNum) - IPV4addr.resize(srcNum + 1, nullptr); - IPV4addr.at(srcNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2)); + IPV4addr.resize(srcNum + 1); + IPV4addr[srcNum] = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2)); if (IPV4addr.size() <= (unsigned)dstNum) - IPV4addr.resize(dstNum + 1, nullptr); - IPV4addr.at(dstNum) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1)); + IPV4addr.resize(dstNum + 1); + IPV4addr[dstNum] = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 1)); if (number_of_links == 255){ xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255");