X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/859dc1bb22428a11af08a1dd97890b9e221e5ff5..6cfc31b251f5de96e65b1dd6e06827caed10ab81:/src/surf/network_ns3.cpp diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 711f4f2739..771bf2771b 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -20,6 +20,9 @@ #include #include +#include "ns3/wifi-module.h" +#include "ns3/mobility-module.h" + #include "network_ns3.hpp" #include "ns3/ns3_simulator.hpp" @@ -48,6 +51,15 @@ static ns3::NodeContainer nodes; static ns3::NodeContainer Cluster_nodes; static ns3::Ipv4InterfaceContainer interfaces; +/* wifi globals */ +static ns3::WifiHelper wifi; +static ns3::YansWifiPhyHelper wifiPhy = ns3::YansWifiPhyHelper::Default (); +static ns3::YansWifiChannelHelper wifiChannel; +static ns3::WifiMacHelper wifiMac; +static ns3::MobilityHelper mobility; +static int mobility_delta = 10; +static int mobility_base = 0; + static int number_of_nodes = 0; static int number_of_clusters_nodes = 0; static int number_of_links = 1; @@ -57,6 +69,7 @@ simgrid::xbt::Extension NetPoin NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject(0)) { + XBT_INFO("NetPointNs3"); stack.Install(ns3_node_); nodes.Add(ns3_node_); node_num = number_of_nodes++; @@ -79,7 +92,7 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con xbt_assert(host_src, "Cannot find a ns-3 host of name %s", host_id.c_str()); // Any ns-3 route is symmetrical - ns3_add_link(host_src, host_dst, cluster.bw, cluster.lat); + ns3_add_direct_route(host_src, host_dst, cluster.bw, cluster.lat, cluster.sharing_policy); delete host_dst; } @@ -89,14 +102,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, + simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* /*gw_src*/, + simgrid::kernel::routing::NetPoint* /*gw_dst*/, std::vector const& link_list) { + XBT_INFO("ROUTE_CREATION"); if (link_list.size() == 1) { auto* link = static_cast(link_list[0]); - XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s", src->get_cname(), dst->get_cname(), link->get_cname(), + XBT_DEBUG("Route from '%s' to '%s' with link '%s' %s %s", src->get_cname(), dst->get_cname(), link->get_cname(), + (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); @@ -109,7 +124,7 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin 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()); - ns3_add_link(host_src, host_dst, link->get_bandwidth(), link->get_latency()); + ns3_add_direct_route(host_src, host_dst, link->get_bandwidth(), link->get_latency(), link->get_sharing_policy()); } else { static bool warned_about_long_routes = false; @@ -128,7 +143,6 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin static void postparse_cb() { IPV4addr.shrink_to_fit(); - ns3::GlobalRouteManager::BuildGlobalRoutingDatabase(); ns3::GlobalRouteManager::InitializeRoutes(); } @@ -165,7 +179,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) pt.extension_set(new NetPointNs3()); XBT_VERB("SimGrid's %s is known as node %d within ns-3", pt.get_cname(), pt.extension()->node_num); }); - surf::on_cluster.connect(&clusterCreation_cb); + routing::on_cluster_creation.connect(&clusterCreation_cb); s4u::Engine::on_platform_created.connect(&postparse_cb); s4u::NetZone::on_route_creation.connect(&routeCreation_cb); @@ -176,10 +190,11 @@ NetworkNS3Model::~NetworkNS3Model() { } LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy) + s4u::Link::SharingPolicy policy) { + XBT_INFO("create_link"); xbt_assert(bandwidths.size() == 1, "ns-3 links must use only 1 bandwidth."); - return new LinkNS3(this, name, bandwidths[0], latency); + return new LinkNS3(this, name, bandwidths[0], latency, policy); } Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) @@ -204,14 +219,14 @@ double NetworkNS3Model::next_occurring_event(double now) return -1.0; XBT_DEBUG("doing a ns3 simulation for a duration of %f", now); - ns3_simulator(now); + ns3_simulator(now); time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_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)) - time_to_next_flow_completion = 0.0; - + 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()); @@ -243,10 +258,10 @@ void NetworkNS3Model::update_actions_state(double now, double delta) std::vector route = std::vector(); - action->src_->route_to(action->dst_, route, nullptr); + action->get_src().route_to(&action->get_dst(), route, nullptr); for (auto const& link : route) - TRACE_surf_resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), - (data_delta_sent) / delta, now - delta, delta); + instr::resource_set_utilization("LINK", "bandwidth_used", link->get_cname(), action->get_category(), + (data_delta_sent) / delta, now - delta, delta); action->last_sent_ = sgFlow->sent_bytes_; } @@ -255,7 +270,7 @@ void NetworkNS3Model::update_actions_state(double now, double delta) socket_to_destroy.push_back(ns3_socket); XBT_DEBUG("Destroy socket %p of action %p", ns3_socket.c_str(), action); action->set_remains(0); - action->finish(kernel::resource::Action::State::FINISHED); + action->finish(Action::State::FINISHED); } else { XBT_DEBUG("Socket %p sent %u bytes out of %u (%u remaining)", ns3_socket.c_str(), sgFlow->sent_bytes_, sgFlow->total_bytes_, sgFlow->remaining_); @@ -279,12 +294,38 @@ void NetworkNS3Model::update_actions_state(double now, double delta) * Resource * ************/ -LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency) +LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) : LinkImpl(model, name, nullptr) { + XBT_INFO("LinkNS3"); bandwidth_.peak = bandwidth; latency_.peak = latency; + sharing_policy_ = policy; + + /* If wifi, create the wifizone now. If not, don't do anything: the links will be created in routeCreate_cb */ + if (policy == s4u::Link::SharingPolicy::WIFI) { +// ns3::NodeContainer ap_nodes; +// ap_nodes.Create(1); + +// phy.SetChannel (channel.Create ()); + +// wifi.SetRemoteStationManager ("ns3::AarfWifiManager"); +// mac.SetType ("ns3::ApWifiMac"); +// ns3::NetDeviceContainer apDevices; +// apDevices = wifi.Install (phy, mac, ap_nodes); + +// mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel"); +// mobility.Install (ap_nodes); + +// stack.Install(ap_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"); +// interfaces.Add(address.Assign(apDevices)); + } s4u::Link::on_creation(*this->get_iface()); } @@ -308,9 +349,8 @@ void LinkNS3::set_latency_profile(profile::Profile*) **********/ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* src, s4u::Host* dst) - : NetworkAction(model, totalBytes, false), src_(src), dst_(dst) + : NetworkAction(model, *src, *dst, totalBytes, false) { - // 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)){ @@ -355,7 +395,7 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s } xbt_assert(port_number <= 65000, "Too many connections! Port number is saturated."); - s4u::Link::on_communicate(*this, src, dst); + s4u::Link::on_communicate(*this); } void NetworkNS3Action::suspend() { @@ -366,7 +406,7 @@ void NetworkNS3Action::resume() { THROW_UNIMPLEMENTED; } -std::list NetworkNS3Action::links() const +std::list NetworkNS3Action::get_links() const { THROW_UNIMPLEMENTED; } @@ -381,7 +421,7 @@ void NetworkNS3Action::update_remains_lazy(double /*now*/) void ns3_simulator(double maxSeconds) { - ns3::EventId id; + ns3::EventId id; if (maxSeconds > 0.0) // If there is a maximum amount of time to run id = ns3::Simulator::Schedule(ns3::Seconds(maxSeconds), &ns3::Simulator::Stop); @@ -425,7 +465,8 @@ void ns3_initialize(std::string TcpProtocol) } } -void ns3_add_cluster(const char* id, double bw, double lat) { +void ns3_add_cluster(const char* /*id*/, double bw, double lat) +{ ns3::NodeContainer Nodes; for (unsigned int i = number_of_clusters_nodes; i < Cluster_nodes.GetN(); i++) { @@ -467,10 +508,13 @@ static std::string transformIpv4Address(ns3::Ipv4Address from) return sstream.str(); } -void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { - ns3::PointToPointHelper pointToPoint; +void ns3_add_direct_route(NetPointNs3* src, NetPointNs3* dst, double bw, double lat, + simgrid::s4u::Link::SharingPolicy policy) +{ + XBT_INFO("ns3_add_direct_route"); ns3::Ipv4AddressHelper address; + ns3::NetDeviceContainer netA; int srcNum = src->node_num; int dstNum = dst->node_num; @@ -478,13 +522,55 @@ void ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat) { ns3::Ptr a = src->ns3_node_; ns3::Ptr b = dst->ns3_node_; - XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, 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))); + if (policy == simgrid::s4u::Link::SharingPolicy::WIFI) { +// wifi.SetStandard (ns3::WIFI_PHY_STANDARD_80211n_2_4GHZ); + wifi.SetStandard (ns3::WIFI_PHY_STANDARD_80211ac); - ns3::NetDeviceContainer netA; - netA.Add(pointToPoint.Install (a, b)); + wifiChannel.SetPropagationDelay ("ns3::ConstantSpeedPropagationDelayModel"); + + wifiChannel.AddPropagationLoss ("ns3::LogDistancePropagationLossModel", + "Exponent", ns3::DoubleValue (3.0), + "ReferenceLoss", ns3::DoubleValue (40.0459)); + + wifiPhy.SetChannel (wifiChannel.Create ()); + + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", + "ControlMode", ns3::StringValue ("VhtMcs0"), + "DataMode", ns3::StringValue ("VhtMcs9")); + + mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel"); + + ns3::Ssid ssid = ns3::Ssid (std::to_string(number_of_networks) + "_" + std::to_string(number_of_links)); + + wifiMac.SetType("ns3::ApWifiMac", + "Ssid", ns3::SsidValue (ssid)); + netA.Add(wifi.Install (wifiPhy, wifiMac, a)); + + wifiMac.SetType ("ns3::StaWifiMac", + "Ssid", ns3::SsidValue (ssid), + "ActiveProbing", ns3::BooleanValue (false)); + netA.Add(wifi.Install (wifiPhy, wifiMac, b)); + + ns3::Ptr positionAllocS = ns3::CreateObject (); +// positionAllocS->Add(ns3::Vector(-5, mobility_base, 0.0)); +// positionAllocS->Add(ns3::Vector(5, mobility_base, 0.0)); + positionAllocS->Add(ns3::Vector(-5, 0, 0.0)); + positionAllocS->Add(ns3::Vector(5, 0, 0.0)); + mobility_base += mobility_delta; + mobility.SetPositionAllocator(positionAllocS); + mobility.Install(a); + mobility.Install(b); + + } else { + ns3::PointToPointHelper pointToPoint; + + XBT_DEBUG("\tAdd PTP from %d to %d bw:'%f Bps' lat:'%fs'", srcNum, dstNum, 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))); + + netA.Add(pointToPoint.Install(a, b)); + } 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");