From: Martin Quinson Date: Sat, 26 Sep 2020 21:49:12 +0000 (+0200) Subject: Merge branch 'master' of framagit.org:simgrid/simgrid into master X-Git-Tag: v3.26~426 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d7377843192020efb1b215c504e36e84558ac520?hp=ab4f9f6bad662cb3c19957013f9862c8de86473b Merge branch 'master' of framagit.org:simgrid/simgrid into master --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fd4f24b37..bae099b0eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ if(enable_ns3) include(FindNS3) if (SIMGRID_HAVE_NS3) set(SIMGRID_HAVE_NS3 1) - foreach(lib core csma point-to-point internet network applications) + foreach(lib core csma point-to-point internet network applications wifi) set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}") endforeach() else() diff --git a/NEWS b/NEWS index 1e54108843..8bfbd6e9dc 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \ / /_ \_/ \___|_| |___/_|\___/|_| |_| |____(_)_____|\___/ (unreleased) + * SMPI: improved support of the proxy apps (including those using petsc) _ _____ ____ ____ __ _____ _ __ ___(_) ___ _ __ |___ / |___ \| ___| \ \ / / _ \ '__/ __| |/ _ \| '_ \ |_ \ __) |___ \ diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index 5a5fe01ebf..9e9be4ed83 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -635,7 +635,7 @@ Querying info .. autodoxymethod:: simgrid::s4u::this_actor::is_maestro() .. autodoxymethod:: simgrid::s4u::this_actor::get_host() - .. autodoxymethod:: simgrid::s4u::this_actor::set_host(Host *new_host) + .. autodoxymethod:: simgrid::s4u::this_actor::set_host(simgrid::s4u::Host *new_host) .. group-tab:: Python diff --git a/docs/source/conf.py b/docs/source/conf.py index d931437de3..e06332da96 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -68,27 +68,47 @@ breathe_default_project = "simgrid" # Setup the autodoxy extension doxygen_xml = os.path.join(os.path.dirname(__file__), "..", "build", "xml") autodoxy_requalified_identifiers = [ # The first element will be substituted into the second one if it's starting an element or preceded by a space - ("ActorPtr", "simgrid::s4u::ActorPtr"), - ("Actor", "simgrid::s4u::Actor"), - ("CommPtr", "simgrid::s4u::CommPtr"), - ("Disk", "simgrid::s4u::Disk"), - ("ExecPtr", "simgrid::s4u::ExecPtr"), - ("Host", "simgrid::s4u::Host"), - ("s4u::Host", "simgrid::s4u::Host"), - ("Engine", "simgrid::s4u::Engine"), - ("Link", "simgrid::s4u::Link"), - ("Mailbox", "simgrid::s4u::Mailbox"), - ("Mutex", "simgrid::s4u::Mutex"), - ("s4u::Mutex", "simgrid::s4u::Mutex"), - ("NetZone", "simgrid::s4u::NetZone"), - ("Semaphore", "simgrid::s4u::Semaphore"), + ("Activity", "simgrid::s4u::Activity"), + ("Actor", "simgrid::s4u::Actor"), + ("ActorPtr", "simgrid::s4u::ActorPtr"), + ("Barrier", "simgrid::s4u::Barrier"), + ("BarrierPtr", "simgrid::s4u::BarrierPtr"), + ("Comm", "simgrid::s4u::Comm"), + ("CommPtr", "simgrid::s4u::CommPtr"), + ("ConditionVariable", "simgrid::s4u::ConditionVariable"), + ("ConditionVariablePtr", "simgrid::s4u::ConditionVariablePtr"), + ("Disk", "simgrid::s4u::Disk"), + ("Exec", "simgrid::s4u::Exec"), + ("ExecPtr", "simgrid::s4u::ExecPtr"), + ("Host", "simgrid::s4u::Host"), + ("s4u::Host", "simgrid::s4u::Host"), + ("Engine", "simgrid::s4u::Engine"), + ("Io", "simgrid::s4u::Io"), + ("Link", "simgrid::s4u::Link"), + ("Mailbox", "simgrid::s4u::Mailbox"), + ("Mutex", "simgrid::s4u::Mutex"), + ("s4u::Mutex", "simgrid::s4u::Mutex"), + ("s4u::MutexPtr", "simgrid::s4u::MutexPtr"), + ("NetZone", "simgrid::s4u::NetZone"), + ("Semaphore", "simgrid::s4u::Semaphore"), + ("VirtualMachine", "simgrid::s4u::VirtualMachine"), ] # Generate a warning for all a cross-reference (such as :func:`myfunc`) that cannot be found nitpicky = True nitpick_ignore = [ ('cpp:identifier', 'boost'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), + ('cpp:identifier', 'boost::intrusive_ptr'), ('cpp:identifier', 'kernel'), + ('cpp:identifier', 'kernel::activity'), + ('cpp:identifier', 'kernel::profile'), + ('cpp:identifier', 'kernel::resource'), + ('cpp:identifier', 'kernel::routing'), ('cpp:identifier', 'simgrid'), ('cpp:identifier', 'simgrid::s4u'), ('cpp:identifier', 'this_actor'), diff --git a/docs/source/ns3.rst b/docs/source/ns3.rst index 969ca7d5f2..e99ff475b5 100644 --- a/docs/source/ns3.rst +++ b/docs/source/ns3.rst @@ -8,6 +8,13 @@ You can use the well-known `ns-3 packet-level network simulator validity of your simulation. Just install ns-3 and recompile SimGrid accordingly. +The SimGrid/ns-3 binding only contains features that are common to both systems. +Not all ns-3 models are available from SimGrid (only the TCP and WiFi ones are), +while not all SimGrid platform files can be used in conjunction ns-3 (routes +must be of length 1). Also, the platform built in ns-3 from the SimGrid +description is very basic. + + Compiling the ns-3/SimGrid binding ********************************** @@ -37,7 +44,9 @@ If your local copy defines the variable ``SIMGRID_HAVE_NS3`` to 1, then ns-3 was correctly detected. Otherwise, explore ``CMakeFiles/CMakeOutput.log`` and ``CMakeFiles/CMakeError.log`` to diagnose the problem. -Test your installation after compilation as follows: +Test that ns-3 was successfully integrated with the following (from your SimGrid +build directory). It will run all SimGrid tests that are related to the ns-3 +integration. If no test is run at all, you probably forgot to enable ns-3 in cmake. .. code-block:: shell @@ -56,11 +65,6 @@ version of either SimGrid or ns-3, try upgrading everything. Using ns-3 from SimGrid *********************** -The SimGrid/ns-3 binding only contains features that are common to both -systems: ns-3 wireless models are not available, while SimGrid routes -cannot be longer than 1. Also, the platform built in ns-3 from the -SimGrid description is very basic. - Platform files compatibility ============================ @@ -69,38 +73,43 @@ harmless, but you still need to connect your hosts using one-hop routes. The best solution is to add routers to split your route. Here is an example of an invalid platform: -.. code-block:: shell +.. code-block:: xml - - + + + + - - + + - - + + This can be reformulated as follows to make it usable with the ns-3 binding. -There is no direct connection from alice to bob, but that's OK because -ns-3 automatically routes from point to point. +There is no direct connection from alice to bob, but that's OK because ns-3 +automatically routes from point to point (using +``ns3::Ipv4GlobalRoutingHelper::PopulateRoutingTables``). -.. code-block:: shell +.. code-block:: xml - + + + - - + + @@ -113,8 +122,8 @@ ns-3 automatically routes from point to point. Once your platform is OK, just change the :ref:`network/model -` configuration option to "ns-3" as follows. The rest -is unchanged. +` configuration option to `ns-3` as follows. The other +options can be used as usual. .. code-block:: shell @@ -125,6 +134,78 @@ ns-3 model, such as `examples/platforms/dogbone.xml `_ to see which ones are used in our regression tests. +WiFi platforms +-------------- + +In SimGrid, WiFi networks are modeled as regular links with a specific +attribute, and these links are then added to routes between hosts. The main +difference When using ns-3 WiFi networks is that the network performance is not +given by the link bandwidth and latency but by the access point WiFi +characteristics, and the distance between the access point and the hosts (called +station in the WiFi world). + +So, to declare a new WiFi network, simply declare a link with the ``WiFi`` +sharing policy as you would do in a pure SimGrid simulation (you must still +provide the ``bandwidth`` and ``latency`` attributes even if they are ignored, +because they are mandatory to the SimGrid XML parser). + +.. code-block:: xml + + + +To declare that a given host is connected to this WiFi zone, use the +``wifi_link`` property of that host. The property value must be the link id that +you want to use as a WiFi zone. This is not needed when using pure SimGrid wifi, +only when using ns-3 wifi, because the wifi performance is :ref:`configured `. + +.. code-block:: xml + + + + + +To connect the station node to the access point node, simply create a route +between them: + +.. code-block:: xml + + + + + +.. _ns3_wifi_perf: + +WiFi network performance +^^^^^^^^^^^^^^^^^^^^^^^^ + + +The performance of a wifi network is controlled by 3 property that can be added +to the an host connected to the wifi zone: + + * ``wifi_mcs`` (`Modulation and Coding Scheme `_) + Roughly speaking, it defines the speed at which the access point is + exchanging data with all stations. It depends on its model and configuration, + and the possible values are listed for example on Wikipedia. + |br| By default, ``wifi_mcs=3``. + * ``wifi_nss`` (Number of Spatial Streams, or `number of antennas `_) + defines the amount of simultaneous data streams that the AP can sustain. + Not all value of MCS and NSS are valid nor compatible (cf. `802.11n standard `_). + |br| By default, ``wifi_nss=1``. + * ``wifi_distance`` is the distance from the station to the access point. Each + station can have a specific value. + |br| By default, ``wifi_distance=10``. + +Here is an example of host changing all these values: + +.. code-block:: xml + + + + + + + + Limitations =========== @@ -132,13 +213,11 @@ A ns-3 platform is automatically created from the provided SimGrid platform. However, there are some known caveats: * The default values (e.g., TCP parameters) are the ns-3 default values. - * ns-3 networks are routed using the shortest path algorithm, using - ``ns3::Ipv4GlobalRoutingHelper::PopulateRoutingTables``. - * End hosts cannot have more than one interface card. So, your - SimGrid hosts should be connected to the platform through only - one link. Otherwise, your SimGrid host will be considered as a - router. - + * ns-3 networks are routed using the shortest path algorithm, using ``ns3::Ipv4GlobalRoutingHelper::PopulateRoutingTables``. + * End hosts cannot have more than one interface card. So, your SimGrid hosts + should be connected to the platform through only one link. Otherwise, your + SimGrid host will be considered as a router (FIXME: is it still true?). + Our goal is to keep the ns-3 plugin of SimGrid as easy (and hopefully readable) as possible. If the current state does not fit your needs, you should modify this plugin, and/or create your own plugin from the existing one. If you come up @@ -152,3 +231,7 @@ is sending data that is not routable in your platform. Make sure that you only use routes of length 1, and that any host is connected to the platform. Arguably, SimGrid could detect this situation and report it, but unfortunately, this is still to be done. + +.. |br| raw:: html + +
diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index c9799cf74f..358799560d 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -20,6 +20,9 @@ #include #include +#include "ns3/mobility-module.h" +#include "ns3/wifi-module.h" + #include "network_ns3.hpp" #include "ns3/ns3_simulator.hpp" @@ -46,13 +49,78 @@ static ns3::InternetStackHelper stack; 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) +{ + std::stringstream sstream; + sstream << from; + return sstream.str(); +} + NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject(0)) { stack.Install(ns3_node_); } +WifiZone::WifiZone(std::string name_, simgrid::s4u::Host* host_, ns3::Ptr ap_node_, + ns3::Ptr channel_, int mcs_, int nss_, int network_, int link_) + : name(name_) + , host(host_) + , ap_node(ap_node_) + , channel(channel_) + , mcs(mcs_) + , nss(nss_) + , network(network_) + , link(link_) +{ + n_sta_nodes = 0; + wifi_zones[name_] = this; +} + +bool WifiZone::is_ap(ns3::Ptr node) +{ + for (std::pair zone : wifi_zones) + if (zone.second->get_ap_node() == node) + return true; + return false; +} + +WifiZone* WifiZone::by_name(std::string name) +{ + WifiZone* zone; + try { + zone = wifi_zones.at(name); + } catch (const std::out_of_range& oor) { + return nullptr; + } + return zone; +} + +std::unordered_map WifiZone::wifi_zones; + +static void initialize_ns3_wifi() +{ + wifi.SetStandard(ns3::WIFI_PHY_STANDARD_80211n_5GHZ); + + for (auto host : simgrid::s4u::Engine::get_instance()->get_all_hosts()) { + const char* wifi_link = host->get_property("wifi_link"); + const char* wifi_mcs = host->get_property("wifi_mcs"); + const char* wifi_nss = host->get_property("wifi_nss"); + + if (wifi_link) + new WifiZone(wifi_link, host, host->get_netpoint()->extension()->ns3_node_, wifiChannel.Create(), + wifi_mcs ? atoi(wifi_mcs) : 3, wifi_nss ? atoi(wifi_nss) : 1, 0, 0); + } +} + /************* * Callbacks * *************/ @@ -68,7 +136,8 @@ static void clusterCreation_cb(simgrid::kernel::routing::ClusterCreationArgs con auto* 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.sharing_policy); // Any ns-3 route is symmetrical + ns3_add_direct_route(src, dst, cluster.bw, cluster.lat, cluster.id, + 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_); @@ -114,7 +183,8 @@ static void routeCreation_cb(bool symmetrical, simgrid::kernel::routing::NetPoin // 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_sharing_policy()); + ns3_add_direct_route(src, dst, link->get_bandwidth(), link->get_latency(), link->get_name(), + link->get_sharing_policy()); } else { static bool warned_about_long_routes = false; @@ -214,14 +284,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()); @@ -298,6 +368,54 @@ LinkNS3::LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwid /* If wifi, create the wifizone now. If not, don't do anything: the links will be created in routeCreate_cb */ + if (policy == simgrid::s4u::Link::SharingPolicy::WIFI) { + static bool wifi_init = false; + if (!wifi_init) { + initialize_ns3_wifi(); + wifi_init = true; + } + + ns3::NetDeviceContainer netA; + WifiZone* zone = WifiZone::by_name(name); + xbt_assert(zone != 0, "Link name '%s' does not match the 'wifi_link' property of a host.", name.c_str()); + NetPointNs3* netpoint_ns3 = zone->get_host()->get_netpoint()->extension(); + + wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager", "ControlMode", ns3::StringValue("HtMcs0"), "DataMode", + ns3::StringValue("HtMcs" + std::to_string(zone->get_mcs()))); + + wifiPhy.SetChannel(zone->get_channel()); + wifiPhy.Set("Antennas", ns3::UintegerValue(zone->get_nss())); + wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(zone->get_nss())); + wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(zone->get_nss())); + + wifiMac.SetType("ns3::ApWifiMac"); + + netA.Add(wifi.Install(wifiPhy, wifiMac, zone->get_ap_node())); + + ns3::Ptr positionAllocS = ns3::CreateObject(); + positionAllocS->Add(ns3::Vector(0, 0, 0)); + mobility.SetPositionAllocator(positionAllocS); + mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); + mobility.Install(zone->get_ap_node()); + + 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()); + auto addresses = address.Assign(netA); + zone->set_network(number_of_networks); + zone->set_link(number_of_links); + + netpoint_ns3->ipv4_address_ = transformIpv4Address(addresses.GetAddress(addresses.GetN() - 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++; + } + } s4u::Link::on_creation(*this->get_iface()); } @@ -388,7 +506,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); @@ -400,15 +518,8 @@ void ns3_simulator(double maxSeconds) id.Cancel(); } -static std::string transformIpv4Address(ns3::Ipv4Address from) -{ - std::stringstream sstream; - sstream << from ; - return sstream.str(); -} - void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, double bw, - double lat, simgrid::s4u::Link::SharingPolicy policy) + double lat, std::string link_name, simgrid::s4u::Link::SharingPolicy policy) { ns3::Ipv4AddressHelper address; ns3::NetDeviceContainer netA; @@ -421,7 +532,44 @@ void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kern 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) { - /* Install a ns3::WifiHelper */ + auto a = host_src->ns3_node_; + auto b = host_dst->ns3_node_; + xbt_assert(WifiZone::is_ap(a) != WifiZone::is_ap(b), + "A wifi route can only exist between an access point node and a station node."); + + ns3::Ptr apNode = WifiZone::is_ap(a) ? a : b; + ns3::Ptr staNode = apNode == a ? b : a; + + WifiZone* zone = WifiZone::by_name(link_name); + + wifi.SetRemoteStationManager("ns3::ConstantRateWifiManager", "ControlMode", ns3::StringValue("HtMcs0"), "DataMode", + ns3::StringValue("HtMcs" + std::to_string(zone->get_mcs()))); + + wifiPhy.SetChannel(zone->get_channel()); + wifiPhy.Set("Antennas", ns3::UintegerValue(zone->get_nss())); + wifiPhy.Set("MaxSupportedTxSpatialStreams", ns3::UintegerValue(zone->get_nss())); + wifiPhy.Set("MaxSupportedRxSpatialStreams", ns3::UintegerValue(zone->get_nss())); + + wifiMac.SetType("ns3::StaWifiMac"); + + netA.Add(wifi.Install(wifiPhy, wifiMac, staNode)); + + ns3::Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", ns3::UintegerValue(40)); + + NetPointNs3* sta_netpointNs3 = WifiZone::is_ap(host_src->ns3_node_) ? host_src : host_dst; + const char* wifi_distance = simgrid::s4u::Host::by_name(sta_netpointNs3->name_)->get_property("wifi_distance"); + ns3::Ptr positionAllocS = ns3::CreateObject(); + positionAllocS->Add(ns3::Vector(wifi_distance ? atof(wifi_distance) : 10.0, 0, 0)); + mobility.SetPositionAllocator(positionAllocS); + mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); + mobility.Install(staNode); + + std::string addr = simgrid::xbt::string_printf("%d.%d.0.0", zone->get_network(), zone->get_link()); + address.SetBase(addr.c_str(), "255.255.0.0", ("0.0.0." + std::to_string(zone->get_n_sta_nodes() + 2)).c_str()); + zone->add_sta_node(); + XBT_DEBUG("\tInterface stack '%s'", addr.c_str()); + auto addresses = address.Assign(netA); + host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(addresses.GetN() - 1)); } else { ns3::PointToPointHelper pointToPoint; @@ -431,21 +579,21 @@ void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kern pointToPoint.SetChannelAttribute("Delay", ns3::TimeValue(ns3::Seconds(lat))); netA.Add(pointToPoint.Install(host_src->ns3_node_, host_dst->ns3_node_)); - } - 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()); - 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()); + auto addresses = address.Assign(netA); - host_src->ipv4_address_ = transformIpv4Address(addresses.GetAddress(0)); - host_dst->ipv4_address_ = transformIpv4Address(addresses.GetAddress(1)); + 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++; + 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++; + } } } diff --git a/src/surf/ns3/ns3_simulator.hpp b/src/surf/ns3/ns3_simulator.hpp index e22cb6ddf0..3500c915da 100644 --- a/src/surf/ns3/ns3_simulator.hpp +++ b/src/surf/ns3/ns3_simulator.hpp @@ -9,6 +9,7 @@ #include "simgrid/s4u/Host.hpp" #include "src/surf/network_ns3.hpp" +#include "ns3/wifi-module.h" #include #include @@ -18,7 +19,10 @@ class XBT_PRIVATE NetPointNs3 { public: static simgrid::xbt::Extension EXTENSION_ID; + void set_name(std::string name) { name_ = name; } + explicit NetPointNs3(); + std::string name_; ns3::Ptr ns3_node_; std::string ipv4_address_; }; @@ -26,7 +30,8 @@ public: XBT_PRIVATE void ns3_initialize(std::string TcpProtocol); XBT_PRIVATE void ns3_simulator(double max_seconds); XBT_PRIVATE void ns3_add_direct_route(simgrid::kernel::routing::NetPoint* src, simgrid::kernel::routing::NetPoint* dst, - double bw, double lat, simgrid::s4u::Link::SharingPolicy policy); + double bw, double lat, std::string link_name, + simgrid::s4u::Link::SharingPolicy policy); class XBT_PRIVATE SgFlow { public: @@ -50,4 +55,39 @@ static inline std::string transform_socket_ptr(ns3::Ptr local_socke return sstream.str(); } +class XBT_PRIVATE WifiZone { +public: + WifiZone(std::string name_, simgrid::s4u::Host* host_, ns3::Ptr ap_node_, + ns3::Ptr channel_, int mcs_, int nss_, int network_, int link_); + + const char* get_cname() { return name.c_str(); } + simgrid::s4u::Host* get_host() { return host; } + ns3::Ptr get_ap_node() { return ap_node; } + ns3::Ptr get_channel() { return channel; } + int get_mcs() { return mcs; } + int get_nss() { return nss; } + int get_network() { return network; } + int get_link() { return link; } + int get_n_sta_nodes() { return n_sta_nodes; } + + void set_network(int network_) { network = network_; } + void set_link(int link_) { link = link_; } + void add_sta_node() { n_sta_nodes++; } + + static bool is_ap(ns3::Ptr node); + static WifiZone* by_name(std::string name); + +private: + std::string name; + simgrid::s4u::Host* host; + ns3::Ptr ap_node; + ns3::Ptr channel; + int mcs; + int nss; + int network; + int link; + int n_sta_nodes = 0; + static std::unordered_map wifi_zones; +}; + #endif