X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58a6e74bc2e1f188543734ef1778169823c090c3..1afd7a413d626bbaa56a551882c53dfa6b649cb0:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 7320bf5c98..cc893351fa 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -28,11 +28,13 @@ #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" @@ -103,8 +105,8 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) int mcs_value = mcs ? atoi(mcs) : 3; int nss_value = nss ? atoi(nss) : 1; #if NS3_MINOR_VERSION < 30 - if (nss_value != 1 + (mcs_value / 8)) - xbt_die("On NS3 < 3.30, NSS value has to satisfy NSS == 1+(MCS/8) constraint. Bailing out"); + 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))); @@ -112,6 +114,9 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) 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"); @@ -156,7 +161,11 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) ns3::Simulator::Schedule(ns3::Seconds(start_time_value), &resumeWifiDevice, device); } +#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 mobility.SetPositionAllocator(positionAllocS); mobility.Install(nodes); @@ -183,7 +192,10 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con { 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(); @@ -227,6 +239,10 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin 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]); @@ -258,10 +274,9 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin *********/ void surf_network_model_init_NS3() { - /* FIXME[donassolo]: this smells bad, but works - * (the constructor saves its pointer in all_existing_models and models_by_type :O). - * We need a manager for these models */ - new simgrid::kernel::resource::NetworkNS3Model(); + auto net_model = std::make_shared("NS3 network model"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); } static simgrid::config::Flag @@ -269,7 +284,7 @@ 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) { @@ -288,14 +303,11 @@ namespace simgrid { namespace kernel { namespace 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); - models_by_type[simgrid::kernel::resource::Model::Type::NETWORK].push_back(this); - NetPointNs3::EXTENSION_ID = routing::NetPoint::extension_create(); ns3::Config::SetDefault("ns3::TcpSocket::SegmentSize", ns3::UintegerValue(1000)); @@ -325,15 +337,23 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) ns3::GlobalRouteManager::InitializeRoutes(); }); routing::on_cluster_creation.connect(&clusterCreation_cb); - s4u::NetZone::on_route_creation.connect(&routeCreation_cb); + routing::NetZoneImpl::on_route_creation.connect(&routeCreation_cb); s4u::NetZone::on_seal.connect(&zoneCreation_cb); } -LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths, - s4u::Link::SharingPolicy policy) +LinkImpl* 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(name, bandwidths[0], policy); + auto* link = new LinkNS3(name, bandwidths[0]); + link->set_model(this); + return link; +} + +LinkImpl* 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) @@ -434,8 +454,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) * Resource * ************/ -LinkNS3::LinkNS3(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy) - : LinkImpl(name), sharing_policy_(policy) +LinkNS3::LinkNS3(const std::string& name, double bandwidth) : LinkImpl(name) { bandwidth_.peak = bandwidth; } @@ -446,15 +465,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_assert(profile == nullptr, "The ns-3 network model doesn't support latency profiles"); +} + +void LinkNS3::set_latency(double latency) { - xbt_die("The ns-3 network model doesn't support latency profiles"); + latency_.peak = latency; } +void LinkNS3::set_sharing_policy(s4u::Link::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) +{ + sharing_policy_ = policy; +} /********** * Action * **********/ @@ -565,33 +595,32 @@ 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(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++; } }