-/* 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. */
#include <ns3/application-container.h>
#include <ns3/event-id.h>
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+
#include "network_ns3.hpp"
#include "ns3/ns3_simulator.hpp"
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;
simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> NetPointNs3::EXTENSION_ID;
-NetPointNs3::NetPointNs3()
+NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject<ns3::Node>(0))
{
- ns3_node_ = ns3::CreateObject<ns3::Node>(0);
+ XBT_INFO("NetPointNs3");
stack.Install(ns3_node_);
nodes.Add(ns3_node_);
node_num = number_of_nodes++;
// Create private link
std::string host_id = cluster.prefix + std::to_string(i) + cluster.suffix;
- auto* host_src = simgrid::s4u::Host::by_name(host_id)->pimpl_netpoint->extension<NetPointNs3>();
+ auto* host_src = simgrid::s4u::Host::by_name(host_id)->get_netpoint()->extension<NetPointNs3>();
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;
}
}
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<simgrid::kernel::resource::LinkImpl*> const& link_list)
{
+ XBT_INFO("ROUTE_CREATION");
if (link_list.size() == 1) {
auto* link = static_cast<simgrid::kernel::resource::LinkNS3*>(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);
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;
static void postparse_cb()
{
IPV4addr.shrink_to_fit();
-
ns3::GlobalRouteManager::BuildGlobalRoutingDatabase();
ns3::GlobalRouteManager::InitializeRoutes();
}
pt.extension_set<NetPointNs3>(new NetPointNs3());
XBT_VERB("SimGrid's %s is known as node %d within ns-3", pt.get_cname(), pt.extension<NetPointNs3>()->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);
}
LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector<double>& 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)
return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::next_occuring_event(double now)
+double NetworkNS3Model::next_occurring_event(double now)
{
double time_to_next_flow_completion = 0.0;
- XBT_DEBUG("ns3_next_occuring_event");
+ XBT_DEBUG("ns3_next_occurring_event");
//get the first relevant value from the running_actions list
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());
std::vector<LinkImpl*> route = std::vector<LinkImpl*>();
- 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_;
}
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_);
* 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");
- s4u::Link::on_creation(this->piface_);
+// 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());
}
LinkNS3::~LinkNS3() = default;
**********/
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)){
static int port_number = 1025; // Port number is limited from 1025 to 65 000
- unsigned int node1 = src->pimpl_netpoint->extension<NetPointNs3>()->node_num;
- unsigned int node2 = dst->pimpl_netpoint->extension<NetPointNs3>()->node_num;
+ unsigned int node1 = src->get_netpoint()->extension<NetPointNs3>()->node_num;
+ unsigned int node2 = dst->get_netpoint()->extension<NetPointNs3>()->node_num;
- ns3::Ptr<ns3::Node> src_node = src->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
- ns3::Ptr<ns3::Node> dst_node = dst->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
+ ns3::Ptr<ns3::Node> src_node = src->get_netpoint()->extension<NetPointNs3>()->ns3_node_;
+ ns3::Ptr<ns3::Node> dst_node = dst->get_netpoint()->extension<NetPointNs3>()->ns3_node_;
xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",
- dst->pimpl_netpoint->get_cname());
+ dst->get_netpoint()->get_cname());
std::string& addr = IPV4addr[node2];
xbt_assert(not addr.empty(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",
- dst->pimpl_netpoint->get_cname());
+ dst->get_netpoint()->get_cname());
XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));
}
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() {
THROW_UNIMPLEMENTED;
}
-std::list<LinkImpl*> NetworkNS3Action::links() const
+std::list<LinkImpl*> NetworkNS3Action::get_links() const
{
THROW_UNIMPLEMENTED;
}
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);
}
}
-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++) {
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;
ns3::Ptr<ns3::Node> a = src->ns3_node_;
ns3::Ptr<ns3::Node> 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<ns3::ListPositionAllocator> positionAllocS = ns3::CreateObject<ns3::ListPositionAllocator> ();
+// 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");
