X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/877fd76c223fe2fba051129f3ba0339bb5566bce..7e2b5532199e316ad70c9f4e070267dcf557e2d5:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index f0ec983771..0bdbf2b114 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -25,7 +25,7 @@ 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 * @@ -56,34 +56,26 @@ HostNs3::HostNs3() * Callbacks * *************/ -static void ns3_add_host(simgrid::s4u::Host& host) +static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) { - host.extension_set(new HostNs3()); -} - -static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard) -{ - xbt_lib_set(as_router_lib, netcard->name().c_str(), NS3_ASR_LEVEL, new HostNs3()); + xbt_lib_set(as_router_lib, netcard->cname(), NS3_ASR_LEVEL, new HostNs3()); } #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); + HostNs3* host_dst = new HostNs3(); + xbt_lib_set(as_router_lib, router_id, NS3_ASR_LEVEL, host_dst); // 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); + HostNs3* host_src = static_cast(xbt_lib_get_or_null(as_router_lib, host_id, NS3_ASR_LEVEL)); + 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); @@ -101,52 +93,41 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster) xbt_free(bw); } -/* Create the ns3 topology based on routing strategy */ -static void create_ns3_topology(void) +static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetCard* src, + simgrid::kernel::routing::NetCard* dst, simgrid::kernel::routing::NetCard* gw_src, + simgrid::kernel::routing::NetCard* gw_dst, std::vector* link_list) { - XBT_DEBUG("Starting topology generation"); - - xbt_dynar_shrink(IPV4addr,0); - - //get the onelinks from the parsed platform - std::vector onelink_routes; - static_cast(simgrid::s4u::Engine::instance()->rootAs()) - ->getOneLinkRoutes(&onelink_routes); - - std::unordered_set already_seen = std::unordered_set(); - - XBT_DEBUG("There is %ld one-link routes", onelink_routes.size()); - for (simgrid::kernel::routing::Onelink* onelink : onelink_routes) { - const char* src = onelink->src_->name().c_str(); - const char* dst = onelink->dst_->name().c_str(); - simgrid::surf::LinkNS3 *link = static_cast(onelink->link_); + if (link_list->size() == 1) { + simgrid::surf::LinkNS3* link = static_cast(link_list->at(0)); - if (strcmp(src,dst) && (already_seen.find(link) == already_seen.end())) { - already_seen.insert(link); - XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName()); - char* link_bdw = bprintf("%fBps", link->bandwidth()); - char* link_lat = bprintf("%fs", link->latency()); + XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->getName(), + (symmetrical ? "(symmetrical)" : "(not symmetrical)")); + char* link_bdw = bprintf("%fBps", link->bandwidth()); + char* link_lat = bprintf("%fs", link->latency()); - // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); - XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat); + // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); + XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat); - //create link ns3 - HostNs3* host_src = ns3_find_host(src); - if (!host_src) - host_src = static_cast(xbt_lib_get_or_null(as_router_lib, src, NS3_ASR_LEVEL)); - HostNs3* host_dst = ns3_find_host(dst); - if(!host_dst) - host_dst = static_cast(xbt_lib_get_or_null(as_router_lib, dst, NS3_ASR_LEVEL)); + // create link ns3 + HostNs3* host_src = static_cast(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL)); + HostNs3* host_dst = static_cast(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL)); - if (!host_src || !host_dst) - xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num); + 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()); - ns3_add_link(host_src->node_num, host_dst->node_num, link_bdw, link_lat); + ns3_add_link(host_src->node_num, host_dst->node_num, link_bdw, link_lat); + if (symmetrical) + ns3_add_link(host_dst->node_num, host_src->node_num, link_bdw, link_lat); - xbt_free(link_bdw); - xbt_free(link_lat); - } + xbt_free(link_bdw); + xbt_free(link_lat); } +} + +/* Create the ns3 topology based on routing strategy */ +static void postparse_cb(void) +{ + IPV4addr.shrink_to_fit(); ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); @@ -168,7 +149,10 @@ 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; +static void del_netcard(void* n) +{ + delete static_cast(n); +} namespace simgrid { namespace surf { @@ -176,21 +160,21 @@ namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { ns3_initialize(ns3_tcp_model.get().c_str()); - simgrid::s4u::Host::onCreation.connect(ns3_add_host); - simgrid::kernel::routing::netcardCreatedCallbacks.connect(ns3_add_netcard); - simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster); - simgrid::surf::on_postparse.connect(&create_ns3_topology); + 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); + NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, &del_netcard); 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); } @@ -315,11 +299,11 @@ void LinkNS3::setLatencyTrace(tmgr_trace_t trace) { NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst) : NetworkAction(model, size, false) { - XBT_DEBUG("Communicate from %s to %s", src->name().c_str(), dst->name().c_str()); + XBT_DEBUG("Communicate from %s to %s", src->cname(), dst->cname()); src_ = src; dst_ = dst; - ns3_create_flow(src->name().c_str(), dst->name().c_str(), surf_get_clock(), size, this); + ns3_create_flow(src, dst, surf_get_clock(), size, this); Link::onCommunicate(this, src, dst); } @@ -354,22 +338,24 @@ int NetworkNS3Action::unref() } } -void ns3_simulator(double maxSeconds){ +void ns3_simulator(double maxSeconds) +{ if (maxSeconds > 0.0) // If there is a maximum amount of time to run ns3::Simulator::Stop(ns3::Seconds(maxSeconds)); - XBT_DEBUG("Start simulator for at most %fs",maxSeconds); + XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, surf_get_clock()); ns3::Simulator::Run (); } -void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action) +void ns3_create_flow(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double startTime, u_int32_t TotalBytes, + simgrid::surf::NetworkNS3Action* action) { - int node1 = ns3_find_host(a)->node_num; - int node2 = ns3_find_host(b)->node_num; + int node1 = static_cast(xbt_lib_get_or_null(as_router_lib, src->cname(), NS3_ASR_LEVEL))->node_num; + int node2 = static_cast(xbt_lib_get_or_null(as_router_lib, dst->cname(), NS3_ASR_LEVEL))->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)); @@ -488,13 +474,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");