X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52866f1c7d5c27d9cf2b8484058e4b60e027d5cb..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 999e63e3e3..6e84927851 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,8 +1,11 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved. */ /* 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 "simgrid/plugins/ns3.hpp" + +#include #include #include @@ -11,15 +14,16 @@ #include "xbt/string.hpp" #include "xbt/utility.hpp" +#include #include #include +#include #include #include #include +#include #include #include -#include -#include #include "ns3/mobility-module.h" #include "ns3/wifi-module.h" @@ -28,36 +32,30 @@ #include "ns3/ns3_simulator.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/kernel/routing/WifiZone.hpp" #include "simgrid/plugins/energy.h" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/NetZone.hpp" #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/kernel/EngineImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/xml/platf_private.hpp" -#include "surf/surf.hpp" +#include "src/surf/xml/platf_private.hpp" // ClusterCreationArgs -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network ns-3 module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns-3"); /***************** * Crude globals * *****************/ -extern std::map flow_from_sock; -extern std::map sink_from_sock; +extern std::map> flow_from_sock; +extern std::map> sink_from_sock; static ns3::InternetStackHelper stack; -static int number_of_links = 1; +static int number_of_links = 1; static int number_of_networks = 1; -/* wifi globals */ -static ns3::WifiHelper wifi; -static ns3::YansWifiPhyHelper wifiPhy = ns3::YansWifiPhyHelper::Default(); -static ns3::YansWifiChannelHelper wifiChannel = ns3::YansWifiChannelHelper::Default(); -static ns3::WifiMacHelper wifiMac; -static ns3::MobilityHelper mobility; - simgrid::xbt::Extension NetPointNs3::EXTENSION_ID; static std::string transformIpv4Address(ns3::Ipv4Address from) @@ -67,111 +65,152 @@ static std::string transformIpv4Address(ns3::Ipv4Address from) return sstream.str(); } -NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject(0)) +NetPointNs3::NetPointNs3() { stack.Install(ns3_node_); } +static void resumeWifiDevice(ns3::Ptr device) +{ + device->GetPhy()->ResumeFromOff(); +} + /************* * Callbacks * *************/ -static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) { - simgrid::kernel::routing::WifiZone* wifizone = dynamic_cast (zone.get_impl()); - if (wifizone == nullptr) return; +static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) +{ + auto const* wifizone = dynamic_cast(zone.get_impl()); + if (wifizone == nullptr) + return; + + /* wifi globals */ + static ns3::WifiHelper wifi; +#if NS3_MINOR_VERSION < 33 + static ns3::YansWifiPhyHelper wifiPhy = ns3::YansWifiPhyHelper::Default(); +#else + static ns3::YansWifiPhyHelper wifiPhy; +#endif + static ns3::YansWifiChannelHelper wifiChannel = ns3::YansWifiChannelHelper::Default(); + static ns3::WifiMacHelper wifiMac; + static ns3::MobilityHelper mobility; #if NS3_MINOR_VERSION < 32 - wifi.SetStandard(ns3::WIFI_PHY_STANDARD_80211n_5GHZ); + wifi.SetStandard(ns3::WIFI_PHY_STANDARD_80211n_5GHZ); +#elif NS3_MINOR_VERSION < 36 + wifi.SetStandard(ns3::WIFI_STANDARD_80211n_5GHZ); #else - wifi.SetStandard(ns3::WIFI_STANDARD_80211n_5GHZ); + wifi.SetStandard(ns3::WIFI_STANDARD_80211n); + wifiPhy.Set ("ChannelSettings", ns3::StringValue ("{0, 0, BAND_5GHZ, 0}")); #endif - std::string ssid = wifizone->get_name(); - const char* mcs = wifizone->get_property("mcs"); - const char* nss = wifizone->get_property("nss"); - int mcs_value = mcs ? atoi(mcs) : 3; - int nss_value = nss ? atoi(nss) : 1; - wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager", - "ControlMode", ns3::StringValue("HtMcs0"), - "DataMode", ns3::StringValue("HtMcs" + std::to_string(mcs_value))); - wifiPhy.SetChannel(wifiChannel.Create()); - wifiPhy.Set("Antennas", ns3::UintegerValue(nss_value)); - wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(nss_value)); - wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(nss_value)); - wifiMac.SetType("ns3::ApWifiMac", - "Ssid", ns3::SsidValue(ssid)); - - mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); - ns3::Ptr positionAllocS = ns3::CreateObject(); - positionAllocS->Add(ns3::Vector(0, 0, 255 * 100 * number_of_networks + 100 * number_of_links)); - - ns3::NetDeviceContainer netDevices; - NetPointNs3* access_point_netpoint_ns3 = wifizone->get_access_point()->extension(); - - ns3::Ptr access_point_ns3_node = access_point_netpoint_ns3->ns3_node_; - ns3::NodeContainer nodes = {access_point_ns3_node}; - std::vector hosts_netpoints = {access_point_netpoint_ns3}; - netDevices.Add(wifi.Install(wifiPhy, wifiMac,access_point_ns3_node)); - - wifiMac.SetType ("ns3::StaWifiMac", - "Ssid", ns3::SsidValue(ssid), - "ActiveProbing", ns3::BooleanValue(false)); - - NetPointNs3* station_netpoint_ns3 = nullptr; - ns3::Ptr station_ns3_node = nullptr; - double distance; - double angle = 0; - int nb_stations = wifizone->get_all_hosts().size() - 1; - double step = 2 * M_PI / nb_stations; - for (auto station_host : wifizone->get_all_hosts()) { - station_netpoint_ns3 = station_host->get_netpoint()->extension(); - if (station_netpoint_ns3 == access_point_netpoint_ns3) - continue; - hosts_netpoints.push_back(station_netpoint_ns3); - distance = station_host->get_property("wifi_distance") ? atof(station_host->get_property("wifi_distance")) : 10.0; - positionAllocS->Add(ns3::Vector(distance * std::cos(angle), distance * std::sin(angle), 255 * 100 * number_of_networks + 100 * number_of_links)); - angle += step; - station_ns3_node = station_netpoint_ns3->ns3_node_; - nodes.Add(station_ns3_node); - netDevices.Add(wifi.Install(wifiPhy, wifiMac, station_ns3_node)); - } + std::string ssid = wifizone->get_name(); + const char* mcs = wifizone->get_property("mcs"); + const char* nss = wifizone->get_property("nss"); + int mcs_value = mcs ? atoi(mcs) : 3; + int nss_value = nss ? atoi(nss) : 1; +#if NS3_MINOR_VERSION < 30 + xbt_assert(nss_value == 1 + (mcs_value / 8), + "On NS3 < 3.30, NSS value has to satisfy NSS == 1+(MCS/8) constraint. Bailing out"); +#endif + wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager", "ControlMode", ns3::StringValue("HtMcs0"), "DataMode", + ns3::StringValue("HtMcs" + std::to_string(mcs_value))); + wifiPhy.SetChannel(wifiChannel.Create()); + wifiPhy.Set("Antennas", ns3::UintegerValue(nss_value)); + wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(nss_value)); + wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(nss_value)); +#if NS3_MINOR_VERSION > 33 + wifiPhy.Set("ChannelWidth", ns3::UintegerValue(40)); +#endif + wifiMac.SetType("ns3::ApWifiMac", "Ssid", ns3::SsidValue(ssid)); + + mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); + ns3::Ptr positionAllocS = ns3::CreateObject(); + positionAllocS->Add(ns3::Vector(0, 0, 255 * 100 * number_of_networks + 100 * number_of_links)); + + ns3::NetDeviceContainer netDevices; + NetPointNs3* access_point_netpoint_ns3 = wifizone->get_access_point()->extension(); + + ns3::Ptr access_point_ns3_node = access_point_netpoint_ns3->ns3_node_; + ns3::NodeContainer nodes = {access_point_ns3_node}; + std::vector hosts_netpoints = {access_point_netpoint_ns3}; + netDevices.Add(wifi.Install(wifiPhy, wifiMac, access_point_ns3_node)); + + wifiMac.SetType("ns3::StaWifiMac", "Ssid", ns3::SsidValue(ssid), "ActiveProbing", ns3::BooleanValue(false)); + + NetPointNs3* station_netpoint_ns3 = nullptr; + ns3::Ptr station_ns3_node = nullptr; + double distance; + double angle = 0; + auto nb_stations = static_cast(wifizone->get_all_hosts().size() - 1); + double step = 2 * M_PI / nb_stations; + for (const auto* station_host : wifizone->get_all_hosts()) { + station_netpoint_ns3 = station_host->get_netpoint()->extension(); + if (station_netpoint_ns3 == access_point_netpoint_ns3) + continue; + hosts_netpoints.push_back(station_netpoint_ns3); + distance = station_host->get_property("wifi_distance") ? atof(station_host->get_property("wifi_distance")) : 10.0; + positionAllocS->Add(ns3::Vector(distance * std::cos(angle), distance * std::sin(angle), + 255 * 100 * number_of_networks + 100 * number_of_links)); + angle += step; + station_ns3_node = station_netpoint_ns3->ns3_node_; + nodes.Add(station_ns3_node); + netDevices.Add(wifi.Install(wifiPhy, wifiMac, station_ns3_node)); + } - ns3::Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", ns3::UintegerValue(40)); + const char* start_time = wifizone->get_property("start_time"); + int start_time_value = start_time ? atoi(start_time) : 0; + for (uint32_t i = 0; i < netDevices.GetN(); i++) { + ns3::Ptr device = ns3::StaticCast(netDevices.Get(i)); + device->GetPhy()->SetOffMode(); + ns3::Simulator::Schedule(ns3::Seconds(start_time_value), &resumeWifiDevice, device); + } - mobility.SetPositionAllocator(positionAllocS); - mobility.Install(nodes); +#if NS3_MINOR_VERSION < 33 + // This fails with "The channel width does not uniquely identify an operating channel" on v3.34, + // so we specified the ChannelWidth of wifiPhy to 40, above, when creating wifiPhy with v3.34 and higher + ns3::Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", ns3::UintegerValue(40)); +#endif - ns3::Ipv4AddressHelper address; - 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()); - ns3::Ipv4InterfaceContainer addresses = address.Assign(netDevices); - for (unsigned int i = 0; i < hosts_netpoints.size(); i++) { - hosts_netpoints[i]->ipv4_address_ = transformIpv4Address(addresses.GetAddress(i)); - } + mobility.SetPositionAllocator(positionAllocS); + mobility.Install(nodes); + ns3::Ipv4AddressHelper address; + 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()); + ns3::Ipv4InterfaceContainer addresses = address.Assign(netDevices); + for (unsigned int i = 0; i < hosts_netpoints.size(); i++) { + hosts_netpoints[i]->ipv4_address_ = transformIpv4Address(addresses.GetAddress(i)); + } - if (number_of_links == 255) { - xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255"); - number_of_links = 1; - number_of_networks++; - } else { - number_of_links++; - } + if (number_of_links == 255) { + xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255"); + number_of_links = 1; + number_of_networks++; + } else { + number_of_links++; + } + /* in theory we can compute the routing table only only once at the platform seal + * however put it here since or platform_created signal is called before the seal right now */ + ns3::Ipv4GlobalRoutingHelper::RecomputeRoutingTables(); } static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs const& cluster) { ns3::NodeContainer Nodes; - for (int const& i : *cluster.radicals) { + xbt_assert(cluster.topology == simgrid::kernel::routing::ClusterTopology::FLAT, + "NS-3 is supported only by flat clusters. Do not use with other topologies"); + + for (int const& i : cluster.radicals) { // Create private link std::string host_id = cluster.prefix + std::to_string(i) + cluster.suffix; - auto* src = simgrid::s4u::Host::by_name(host_id)->get_netpoint(); - auto* dst = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(cluster.router_id); + auto const* src = simgrid::s4u::Host::by_name(host_id)->get_netpoint(); + auto const* dst = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(cluster.router_id); xbt_assert(dst != nullptr, "No router named %s", cluster.router_id.c_str()); - ns3_add_direct_route(src, dst, cluster.bw, cluster.lat, cluster.id, - cluster.sharing_policy); // Any ns-3 route is symmetrical + ns3_add_direct_route(src, dst, cluster.bw, cluster.lat, cluster.sharing_policy); // Any ns-3 route is symmetrical // Also add the host to the list of hosts that will be connected to the backbone Nodes.Add(src->extension()->ns3_node_); @@ -182,7 +221,8 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con xbt_assert(Nodes.GetN() <= 65000, "Cluster with ns-3 is limited to 65000 nodes"); ns3::CsmaHelper csma; csma.SetChannelAttribute("DataRate", - ns3::DataRateValue(ns3::DataRate(cluster.bb_bw * 8))); // ns-3 takes bps, but we provide Bps + ns3::DataRateValue(ns3::DataRate( + static_cast(cluster.bb_bw * 8)))); // ns-3 takes bps, but we provide Bps csma.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(cluster.bb_lat))); ns3::NetDeviceContainer devices = csma.Install(Nodes); XBT_DEBUG("Create CSMA"); @@ -202,11 +242,16 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con } } -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 const& link_list) +static void routeCreation_cb(bool symmetrical, const simgrid::kernel::routing::NetPoint* src, + const simgrid::kernel::routing::NetPoint* dst, + const simgrid::kernel::routing::NetPoint* /*gw_src*/, + const simgrid::kernel::routing::NetPoint* /*gw_dst*/, + std::vector const& link_list) { + /* ignoring routes from StarZone, not supported */ + if (not src || not dst) + return; + if (link_list.size() == 1) { auto const* link = static_cast(link_list[0]); @@ -214,11 +259,9 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin (link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI ? "(wifi)" : "(wired)"), (symmetrical ? "(symmetrical)" : "(not symmetrical)")); - // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id); XBT_DEBUG("\tLink (%s) bw:%fbps lat:%fs", link->get_cname(), link->get_bandwidth(), link->get_latency()); - ns3_add_direct_route(src, dst, link->get_bandwidth(), link->get_latency(), link->get_name(), - link->get_sharing_policy()); + ns3_add_direct_route(src, dst, link->get_bandwidth(), link->get_latency(), link->get_sharing_policy()); } else { static bool warned_about_long_routes = false; @@ -238,9 +281,10 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin *********/ void surf_network_model_init_NS3() { - xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice"); - - surf_network_model = new simgrid::kernel::resource::NetworkNS3Model(); + auto net_model = std::make_shared("NS3 network model"); + auto* engine = simgrid::kernel::EngineImpl::get_instance(); + engine->add_model(net_model); + engine->get_netzone_root()->set_network_model(net_model); } static simgrid::config::Flag @@ -248,40 +292,36 @@ static simgrid::config::Flag static simgrid::config::Flag ns3_seed( "ns3/seed", "The random seed provided to ns-3. Either 'time' to seed with time(), blank to not set (default), or a number.", "", - [](std::string val) { + [](const std::string& val) { if (val.length() == 0) return; if (strcasecmp(val.c_str(), "time") == 0) { - std::srand(time(NULL)); - ns3::RngSeedManager::SetSeed(std::rand()); - ns3::RngSeedManager::SetRun(std::rand()); + std::default_random_engine prng(time(nullptr)); + ns3::RngSeedManager::SetSeed(static_cast(prng())); + ns3::RngSeedManager::SetRun(static_cast(prng())); } else { - int v = xbt_str_parse_int( - val.c_str(), "Invalid value for option ns3/seed. It must be either 'time', a number, or left empty."); + auto v = static_cast(xbt_str_parse_int( + val.c_str(), "Invalid value for option ns3/seed. It must be either 'time', a number, or left empty.")); ns3::RngSeedManager::SetSeed(v); ns3::RngSeedManager::SetRun(v); } }); namespace simgrid { -namespace kernel { -namespace resource { +namespace kernel::resource { -NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) +NetworkNS3Model::NetworkNS3Model(const std::string& name) : NetworkModel(name) { xbt_assert(not sg_link_energy_is_inited(), "LinkEnergy plugin and ns-3 network models are not compatible. Are you looking for Ecofen, maybe?"); - all_existing_models.push_back(this); - NetPointNs3::EXTENSION_ID = routing::NetPoint::extension_create(); ns3::Config::SetDefault("ns3::TcpSocket::SegmentSize", ns3::UintegerValue(1000)); ns3::Config::SetDefault("ns3::TcpSocket::DelAckCount", ns3::UintegerValue(1)); ns3::Config::SetDefault("ns3::TcpSocketBase::Timestamp", ns3::BooleanValue(false)); - auto TcpProtocol = ns3_tcp_model.get(); - if (TcpProtocol == "default") { + if (auto const& TcpProtocol = ns3_tcp_model.get(); TcpProtocol == "default") { /* nothing to do */ } else if (TcpProtocol == "Reno" || TcpProtocol == "NewReno" || TcpProtocol == "Tahoe") { @@ -297,24 +337,38 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) XBT_VERB("Declare SimGrid's %s within ns-3", pt.get_cname()); }); - s4u::Engine::on_platform_created.connect([]() { + s4u::Engine::on_platform_created_cb([]() { /* Create the ns3 topology based on routing strategy */ + ns3::GlobalRouteManager::DeleteGlobalRoutes(); // just in case this callback is called twice ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); }); routing::on_cluster_creation.connect(&clusterCreation_cb); - s4u::NetZone::on_route_creation.connect(&routeCreation_cb); - s4u::NetZone::on_seal.connect(&zoneCreation_cb); + routing::NetZoneImpl::on_route_creation.connect(&routeCreation_cb); + s4u::NetZone::on_seal_cb(&zoneCreation_cb); } -LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy policy) +NetworkNS3Model::~NetworkNS3Model() +{ + ns3::Simulator::Destroy(); +} + +StandardLinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths) { xbt_assert(bandwidths.size() == 1, "ns-3 links must use only 1 bandwidth."); - return new LinkNS3(this, name, bandwidths[0], latency, policy); + auto* link = new LinkNS3(name, bandwidths[0]); + link->set_model(this); + return link; +} + +StandardLinkImpl* NetworkNS3Model::create_wifi_link(const std::string& name, const std::vector& bandwidths) +{ + auto* link = create_link(name, bandwidths); + link->set_sharing_policy(s4u::Link::SharingPolicy::WIFI, {}); + return link; } -Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) +Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate, bool /*streamed*/) { xbt_assert(rate == -1, "Communication over ns-3 links cannot specify a specific rate. Please use -1 as a value instead of %f.", @@ -327,7 +381,7 @@ double NetworkNS3Model::next_occurring_event(double now) double time_to_next_flow_completion = 0.0; XBT_DEBUG("ns3_next_occurring_event"); - //get the first relevant value from the running_actions list + // get the first relevant value from the running_actions list // If there is no comms in NS-3, then we do not move it forward. // We will synchronize NS-3 with SimGrid when starting a new communication. @@ -337,16 +391,16 @@ double NetworkNS3Model::next_occurring_event(double now) XBT_DEBUG("doing a ns3 simulation for a duration of %f", now); ns3_simulator(now); - time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock(); + time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - EngineImpl::get_clock(); // NS-3 stops as soon as a flow ends, // but it does not process the other flows that may finish at the same (simulated) time. // If another flow ends at the same time, time_to_next_flow_completion = 0 - if(double_equals(time_to_next_flow_completion, 0, sg_surf_precision)) + if (double_equals(time_to_next_flow_completion, 0, sg_surf_precision)) time_to_next_flow_completion = 0.0; XBT_DEBUG("min : %f", now); XBT_DEBUG("ns3 time : %f", ns3::Simulator::Now().GetSeconds()); - XBT_DEBUG("surf time : %f", surf_get_clock()); + XBT_DEBUG("surf time : %f", EngineImpl::get_clock()); XBT_DEBUG("Next completion %f :", time_to_next_flow_completion); return time_to_next_flow_completion; @@ -356,34 +410,31 @@ void NetworkNS3Model::update_actions_state(double now, double delta) { static std::vector socket_to_destroy; - std::string ns3_socket; - for (const auto& elm : flow_from_sock) { - ns3_socket = elm.first; - SgFlow* sgFlow = elm.second; - NetworkNS3Action * action = sgFlow->action_; + for (const auto& [ns3_socket, sgFlow] : flow_from_sock) { + NetworkNS3Action* action = sgFlow->action_; XBT_DEBUG("Processing flow %p (socket %s, action %p)", sgFlow, ns3_socket.c_str(), action); // Because NS3 stops as soon as a flow is finished, the other flows that ends at the same time may remains in an // inconsistent state (i.e. remains_ == 0 but finished_ == false). // However, SimGrid considers sometimes that an action with remains_ == 0 is finished. // Thus, to avoid inconsistencies between SimGrid and NS3, set remains to 0 only when the flow is finished in NS3 - int remains = action->get_cost() - sgFlow->sent_bytes_; - if(remains > 0) + double remains = action->get_cost() - sgFlow->sent_bytes_; + if (remains > 0) action->set_remains(remains); if (TRACE_is_enabled() && action->get_state() == kernel::resource::Action::State::STARTED) { double data_delta_sent = sgFlow->sent_bytes_ - action->last_sent_; - std::vector route = std::vector(); - + std::vector route; action->get_src().route_to(&action->get_dst(), route, nullptr); for (auto const& link : route) instr::resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), - (data_delta_sent) / delta, now - delta, delta); + data_delta_sent / delta, now - delta, delta); action->last_sent_ = sgFlow->sent_bytes_; } - if ((sgFlow->finished_) && (remains <= 0)) { // finished_ should not become true before remains gets to 0, but it sometimes does. Let's play safe, here. + if ((sgFlow->finished_) && (remains <= 0)) { // finished_ should not become true before remains gets to 0, but it + // sometimes does. Let's play safe, here. socket_to_destroy.push_back(ns3_socket); XBT_DEBUG("Destroy socket %s of action %p", ns3_socket.c_str(), action); action->set_remains(0); @@ -395,10 +446,10 @@ void NetworkNS3Model::update_actions_state(double now, double delta) } while (not socket_to_destroy.empty()) { - ns3_socket = socket_to_destroy.back(); + std::string ns3_socket = socket_to_destroy.back(); socket_to_destroy.pop_back(); SgFlow* flow = flow_from_sock.at(ns3_socket); - if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) { + if (XBT_LOG_ISENABLED(res_ns3, xbt_log_priority_debug)) { XBT_DEBUG("Removing socket %s of action %p", ns3_socket.c_str(), flow->action_); } delete flow; @@ -411,14 +462,9 @@ void NetworkNS3Model::update_actions_state(double now, double delta) * Resource * ************/ -LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) - : LinkImpl(model, name, nullptr), sharing_policy_(policy) +LinkNS3::LinkNS3(const std::string& name, double bandwidth) : StandardLinkImpl(name) { bandwidth_.peak = bandwidth; - latency_.peak = latency; - - s4u::Link::on_creation(*this->get_iface()); } LinkNS3::~LinkNS3() = default; @@ -427,15 +473,26 @@ void LinkNS3::apply_event(profile::Event*, double) { THROW_UNIMPLEMENTED; } -void LinkNS3::set_bandwidth_profile(profile::Profile*) + +void LinkNS3::set_bandwidth_profile(profile::Profile* profile) { - xbt_die("The ns-3 network model doesn't support bandwidth profiles"); + xbt_assert(profile == nullptr, "The ns-3 network model doesn't support bandwidth profiles"); } -void LinkNS3::set_latency_profile(profile::Profile*) + +void LinkNS3::set_latency_profile(profile::Profile* profile) { - xbt_die("The ns-3 network model doesn't support latency profiles"); + xbt_assert(profile == nullptr, "The ns-3 network model doesn't support latency profiles"); } +void LinkNS3::set_latency(double latency) +{ + latency_.peak = latency; +} + +void LinkNS3::set_sharing_policy(s4u::Link::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) +{ + sharing_policy_ = policy; +} /********** * Action * **********/ @@ -446,8 +503,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s // ns-3 fails when src = dst, so avoid the problem by considering that communications are infinitely fast on the // loopback that does not exists if (src == dst) { - static bool warned = false; - if (not warned) { + if (static bool warned = false; not warned) { XBT_WARN("Sending from a host %s to itself is not supported by ns-3. Every such communication finishes " "immediately upon startup.", src->get_cname()); @@ -458,19 +514,20 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s } // If there is no other started actions, we need to move NS-3 forward to be sync with SimGrid - if (model->get_started_action_set()->size()==1){ - while(double_positive(surf_get_clock() - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)){ - XBT_DEBUG("Synchronizing NS-3 (time %f) with SimGrid (time %f)", ns3::Simulator::Now().GetSeconds(), surf_get_clock()); - ns3_simulator(surf_get_clock() - ns3::Simulator::Now().GetSeconds()); + if (model->get_started_action_set()->size() == 1) { + while (double_positive(EngineImpl::get_clock() - ns3::Simulator::Now().GetSeconds(), sg_surf_precision)) { + XBT_DEBUG("Synchronizing NS-3 (time %f) with SimGrid (time %f)", ns3::Simulator::Now().GetSeconds(), + EngineImpl::get_clock()); + ns3_simulator(EngineImpl::get_clock() - ns3::Simulator::Now().GetSeconds()); } } static uint16_t port_number = 1; - ns3::Ptr src_node = src->get_netpoint()->extension()->ns3_node_; - ns3::Ptr dst_node = dst->get_netpoint()->extension()->ns3_node_; + ns3::Ptr src_node = get_ns3node_from_sghost(src); + ns3::Ptr dst_node = get_ns3node_from_sghost(dst); - std::string& addr = dst->get_netpoint()->extension()->ipv4_address_; + const std::string& addr = dst->get_netpoint()->extension()->ipv4_address_; xbt_assert(not addr.empty(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?", dst->get_netpoint()->get_cname()); @@ -482,8 +539,8 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s XBT_DEBUG("Create socket %s for a flow of %.0f Bytes from %s to %s with Interface %s", transform_socket_ptr(sock).c_str(), totalBytes, src->get_cname(), dst->get_cname(), addr.c_str()); - flow_from_sock.insert({transform_socket_ptr(sock), new SgFlow(totalBytes, this)}); - sink_from_sock.insert({transform_socket_ptr(sock), apps}); + flow_from_sock.try_emplace(transform_socket_ptr(sock), new SgFlow(static_cast(totalBytes), this)); + sink_from_sock.try_emplace(transform_socket_ptr(sock), apps); sock->Bind(ns3::InetSocketAddress(port_number)); ns3::Simulator::ScheduleNow(&start_flow, sock, addr.c_str(), port_number); @@ -491,19 +548,19 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s port_number = 1 + (port_number % UINT16_MAX); if (port_number == 1) XBT_WARN("Too many connections! Port number is saturated. Trying to use the oldest ports."); - - s4u::Link::on_communicate(*this); } -void NetworkNS3Action::suspend() { +void NetworkNS3Action::suspend() +{ THROW_UNIMPLEMENTED; } -void NetworkNS3Action::resume() { +void NetworkNS3Action::resume() +{ THROW_UNIMPLEMENTED; } -std::list NetworkNS3Action::get_links() const +std::list NetworkNS3Action::get_links() const { THROW_UNIMPLEMENTED; } @@ -512,8 +569,13 @@ void NetworkNS3Action::update_remains_lazy(double /*now*/) THROW_IMPOSSIBLE; } -} // namespace resource -} // namespace kernel +} // namespace kernel::resource + +ns3::Ptr get_ns3node_from_sghost(const simgrid::s4u::Host* host) +{ + xbt_assert(host->get_netpoint()->extension() != nullptr, "Please only use this function on ns-3 nodes"); + return host->get_netpoint()->extension()->ns3_node_; +} } // namespace simgrid void ns3_simulator(double maxSeconds) @@ -522,16 +584,16 @@ void ns3_simulator(double maxSeconds) if (maxSeconds > 0.0) // If there is a maximum amount of time to run id = ns3::Simulator::Schedule(ns3::Seconds(maxSeconds), &ns3::Simulator::Stop); - XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, surf_get_clock()); - ns3::Simulator::Run (); + XBT_DEBUG("Start simulator for at most %fs (current time: %f)", maxSeconds, simgrid::kernel::EngineImpl::get_clock()); + ns3::Simulator::Run(); XBT_DEBUG("Simulator stopped at %fs", ns3::Simulator::Now().GetSeconds()); - if(maxSeconds > 0.0) + if (maxSeconds > 0.0) id.Cancel(); } -void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, double bw, - double lat, const std::string& link_name, simgrid::s4u::Link::SharingPolicy policy) +void ns3_add_direct_route(const simgrid::kernel::routing::NetPoint* src, const simgrid::kernel::routing::NetPoint* dst, + double bw, double lat, simgrid::s4u::Link::SharingPolicy policy) { ns3::Ipv4AddressHelper address; ns3::NetDeviceContainer netA; @@ -543,33 +605,33 @@ void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kern xbt_assert(host_src != nullptr, "Network element %s does not seem to be ns-3-ready", src->get_cname()); xbt_assert(host_dst != nullptr, "Network element %s does not seem to be ns-3-ready", dst->get_cname()); - if (policy == simgrid::s4u::Link::SharingPolicy::WIFI) { - xbt_die("The wifi sharing policy is not supported for links. You want to use a wifi zone (see documentation)."); - } else { - ns3::PointToPointHelper pointToPoint; + xbt_assert(policy != simgrid::s4u::Link::SharingPolicy::WIFI, + "The wifi sharing policy is not supported for links. You want to use a wifi zone (see documentation)."); - XBT_DEBUG("\tAdd PTP from %s to %s bw:'%f Bps' lat:'%fs'", src->get_cname(), dst->get_cname(), bw, lat); - pointToPoint.SetDeviceAttribute("DataRate", - ns3::DataRateValue(ns3::DataRate(bw * 8))); // ns-3 takes bps, but we provide Bps - pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat))); + ns3::PointToPointHelper pointToPoint; - netA.Add(pointToPoint.Install(host_src->ns3_node_, host_dst->ns3_node_)); + XBT_DEBUG("\tAdd PTP from %s to %s bw:'%f Bps' lat:'%fs'", src->get_cname(), dst->get_cname(), bw, lat); + pointToPoint.SetDeviceAttribute( + "DataRate", + ns3::DataRateValue(ns3::DataRate(static_cast(bw * 8)))); // ns-3 takes bps, but we provide Bps + pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat))); - 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()); + netA.Add(pointToPoint.Install(host_src->ns3_node_, host_dst->ns3_node_)); - auto addresses = address.Assign(netA); + 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()); - host_src->ipv4_address_ = transformIpv4Address(addresses.GetAddress(0)); - host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(1)); + auto addresses = address.Assign(netA); - if (number_of_links == 255) { - xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255"); - number_of_links = 1; - number_of_networks++; - } else { - number_of_links++; - } + host_src->ipv4_address_ = transformIpv4Address(addresses.GetAddress(0)); + host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(1)); + + if (number_of_links == 255) { + xbt_assert(number_of_networks < 255, "Number of links and networks exceed 255*255"); + number_of_links = 1; + number_of_networks++; + } else { + number_of_links++; } }