X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/06ba40de09b9b08ab2b7879d175d2019200245b2..55b3e236db71d2245c71ff1ea3cbec120a0e0d8d:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index e98eaf8d50..6bc87ef269 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" @@ -16,16 +16,16 @@ #include "simgrid/sg_config.h" #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #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 NetPointNs3::EXTENSION_ID; + +NetPointNs3::NetPointNs3() { ns3::Ptr node = ns3::CreateObject(0); stack.Install(node); @@ -56,30 +58,24 @@ HostNs3::HostNs3() * Callbacks * *************/ -static void netcardCreation_cb(simgrid::kernel::routing::NetCard* netcard) -{ - 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 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); - HostNs3* host_dst = new HostNs3(); - xbt_lib_set(as_router_lib, router_id, NS3_ASR_LEVEL, host_dst); + // 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 NetPointNS3 so that it gets one + NetPointNs3* host_dst = new NetPointNs3(); // Create private link char* host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - HostNs3* host_src = static_cast(xbt_lib_get_or_null(as_router_lib, host_id, NS3_ASR_LEVEL)); + NetPointNs3* host_src = sg_host_by_name(host_id)->pimpl_netpoint->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); @@ -93,24 +89,25 @@ static void clusterCreation_cb(sg_platf_cluster_cbarg_t cluster) xbt_free(bw); } -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) +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) { if (link_list->size() == 1) { simgrid::surf::LinkNS3* link = static_cast(link_list->at(0)); - XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->getName(), + XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->cname(), dst->cname(), link->cname(), (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("\tLink (%s) bdw:%s lat:%s", link->cname(), link_bdw, link_lat); // 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)); + NetPointNs3* host_src = src->extension(); + NetPointNs3* 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()); @@ -127,7 +124,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_dynar_shrink(IPV4addr,0); + IPV4addr.shrink_to_fit(); ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); @@ -149,35 +146,35 @@ static simgrid::config::Flag ns3_tcp_model("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default"); -static void del_netcard(void* n) -{ - delete static_cast(n); -} - namespace simgrid { namespace surf { NetworkNS3Model::NetworkNS3Model() : NetworkModel() { + NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create(); + ns3_initialize(ns3_tcp_model.get().c_str()); - 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); + simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) { + pt->extension_set(new NetPointNs3()); - NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, &del_netcard); + }); + simgrid::surf::on_cluster.connect(&clusterCreation_cb); + simgrid::s4u::onPlatformCreated.connect(&postparse_cb); + 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); } -Link* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) +LinkImpl* NetworkNS3Model::createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { return new LinkNS3(this, name, bandwidth, latency); } @@ -234,11 +231,12 @@ void NetworkNS3Model::updateActionsState(double now, double delta) action->getState() == Action::State::running){ double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_; - std::vector route = std::vector(); + std::vector route = std::vector(); action->src_->routeTo(action->dst_, &route, nullptr); for (auto link : route) - TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta); + TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), (data_delta_sent) / delta, now - delta, + delta); action->lastSent_ = sgFlow->sentBytes_; } @@ -267,17 +265,15 @@ void NetworkNS3Model::updateActionsState(double now, double delta) ************/ LinkNS3::LinkNS3(NetworkNS3Model* model, const char* name, double bandwidth, double latency) - : Link(model, name, nullptr) + : LinkImpl(model, name, nullptr) { bandwidth_.peak = bandwidth; latency_.peak = latency; - Link::onCreation(this); + s4u::Link::onCreation(this->piface_); } -LinkNS3::~LinkNS3() -{ -} +LinkNS3::~LinkNS3() = default; void LinkNS3::apply_event(tmgr_trace_iterator_t event, double value) { @@ -303,7 +299,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4 dst_ = dst; ns3_create_flow(src, dst, surf_get_clock(), size, this); - Link::onCommunicate(this, src, dst); + s4u::Link::onCommunicate(this, src, dst); } void NetworkNS3Action::suspend() { @@ -347,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 = 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; + int node1 = src->pimpl_netpoint->extension()->node_num; + int node2 = dst->pimpl_netpoint->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)); @@ -472,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");