X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc6d65f0d0ee70a889f1621abb1d3778a3da11d6..a79a8e1cab86ccc687cfbc97b01b735acb996f16:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 24dee57353..16d6986c2c 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -5,7 +5,7 @@ #include -#include +#include "xbt/config.hpp" #include "ns3/core-module.h" #include "ns3/node.h" @@ -20,12 +20,12 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/surf_private.h" -#include "simgrid/s4u/As.hpp" +#include "simgrid/s4u/NetZone.hpp" #include "simgrid/s4u/engine.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module"); -xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free); +std::vector IPV4addr; /***************** * Crude globals * @@ -44,7 +44,9 @@ static int number_of_links = 1; static int number_of_networks = 1; static int port_number = 1025; //Port number is limited from 1025 to 65 000 -HostNs3::HostNs3() +simgrid::xbt::Extension NetCardNs3::EXTENSION_ID; + +NetCardNs3::NetCardNs3() { ns3::Ptr node = ns3::CreateObject(0); stack.Install(node); @@ -56,38 +58,29 @@ HostNs3::HostNs3() * Callbacks * *************/ -static void ns3_add_host(simgrid::s4u::Host& host) -{ - host.extension_set(new HostNs3()); -} - -static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard) +static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) { - xbt_lib_set(as_router_lib, netcard->name().c_str(), NS3_ASR_LEVEL, new HostNs3()); + netcard->extension_set(new NetCardNs3()); } -#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area -static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) +static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) { char* lat = bprintf("%fs", cluster->lat); char* bw = bprintf("%fBps", cluster->bw); for (int i : *cluster->radicals) { - char* router_id = bprintf("router_%s%d%s", cluster->prefix, i, cluster->suffix); - - simgrid::s4u::Host* router = new simgrid::s4u::Host(router_id); - ns3_add_host(*router); + // Routers don't create a router on the other end of the private link by themselves. + // We just need this router to be given an ID so we create a temporary NetCardNS3 so that it gets one + NetCardNs3* host_dst = new NetCardNs3(); // Create private link char* host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - HostNs3* host_src = ns3_find_host(host_id); - HostNs3* host_dst = router->extension(); - - xbt_assert(host_src && host_dst, "\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); + NetCardNs3* host_src = sg_host_by_name(host_id)->pimpl_netcard->extension(); + xbt_assert(host_src, "Cannot find a NS3 host of name %s", host_id); ns3_add_link(host_src->node_num, host_dst->node_num, bw,lat); - free(router_id); + delete host_dst; free(host_id); } xbt_free(lat); @@ -117,17 +110,8 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetCard XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat); // create link ns3 - HostNs3* host_src = nullptr; - HostNs3* host_dst = nullptr; - if (src->isHost()) - host_src = sg_host_by_name(src->cname())->extension(); - else - host_src = static_cast(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL)); - - if (dst->isHost()) - host_dst = sg_host_by_name(dst->cname())->extension(); - else - host_dst = static_cast(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL)); + NetCardNs3* host_src = src->extension(); + NetCardNs3* host_dst = dst->extension(); xbt_assert(host_src != nullptr, "Network element %s does not seem to be NS3-ready", src->cname()); xbt_assert(host_dst != nullptr, "Network element %s does not seem to be NS3-ready", dst->cname()); @@ -144,9 +128,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetCard /* Create the ns3 topology based on routing strategy */ static void postparse_cb(void) { - XBT_DEBUG("Starting topology generation"); - - xbt_dynar_shrink(IPV4addr,0); + IPV4addr.shrink_to_fit(); ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); @@ -168,30 +150,27 @@ static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default"); -simgrid::xbt::Extension HostNs3::EXTENSION_ID; - namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { + NetCardNs3::EXTENSION_ID = simgrid::kernel::routing::NetCard::extension_create(); + ns3_initialize(ns3_tcp_model.get().c_str()); - simgrid::s4u::Host::onCreation.connect(ns3_add_host); - simgrid::kernel::routing::NetCard::onCreation.connect(ns3_add_netcard); - simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); + simgrid::kernel::routing::NetCard::onCreation.connect(&netcardCreation_cb); + simgrid::surf::on_cluster.connect(&clusterCreation_cb); simgrid::surf::on_postparse.connect(&postparse_cb); - simgrid::s4u::As::onRouteCreation.connect(&routeCreation_cb); - - HostNs3::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - - NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f); + simgrid::s4u::NetZone::onRouteCreation.connect(&routeCreation_cb); LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO); LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO); } NetworkNS3Model::~NetworkNS3Model() { - xbt_dynar_free_container(&IPV4addr); + for (auto addr : IPV4addr) + free(addr); + IPV4addr.clear(); xbt_dict_free(&flowFromSock); } @@ -294,9 +273,7 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, dou Link::onCreation(this); } -LinkNS3::~LinkNS3() -{ -} +LinkNS3::~LinkNS3() = default; void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value) { @@ -366,13 +343,13 @@ void ns3_simulator(double maxSeconds) void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double startTime, u_int32_t TotalBytes, simgrid::surf::NetworkNS3Action* action) { - int node1 = src->extension()->node_num; - int node2 = dst->extension()->node_num; + int node1 = src->pimpl_netcard->extension()->node_num; + int node2 = dst->pimpl_netcard->extension()->node_num; ns3::Ptr src_node = nodes.Get(node1); ns3::Ptr dst_node = nodes.Get(node2); - char* addr = (char*)xbt_dynar_get_as(IPV4addr,node2,char*); + char* addr = IPV4addr.at(node2); XBT_DEBUG("ns3_create_flow %d Bytes from %d to %d with Interface %s",TotalBytes, node1, node2,addr); ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress (ns3::Ipv4Address::GetAny(), port_number)); @@ -491,13 +468,13 @@ void ns3_add_link(int src, int dst, char *bw, char *lat) free(adr); interfaces.Add(address.Assign (netA)); - char *tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-2)); - xbt_dynar_set_as(IPV4addr,src,char*,tmp); - XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,src,char*),src); + if (IPV4addr.size() <= (unsigned)src) + IPV4addr.resize(src + 1, nullptr); + IPV4addr.at(src) = transformIpv4Address(interfaces.GetAddress(interfaces.GetN() - 2)); - tmp = transformIpv4Address(interfaces.GetAddress(interfaces.GetN()-1)); - xbt_dynar_set_as(IPV4addr,dst,char*,tmp); - XBT_DEBUG("Have write '%s' for Node '%d'",(char*)xbt_dynar_get_as(IPV4addr,dst,char*),dst); + if (IPV4addr.size() <= (unsigned)dst) + IPV4addr.resize(dst + 1, nullptr); + IPV4addr.at(dst) = 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");