Remove constraint from LinkImpl ctor

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 8bad917..569b6c6 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -76,8 +76,9 @@ NetPointNs3::NetPointNs3() : ns3_node_(ns3::CreateObject<ns3::Node>(0))
   stack.Install(ns3_node_);
 }
 
-void resumeWifiDevice(ns3::Ptr<ns3::WifiNetDevice> device) {
-    device->GetPhy()->ResumeFromOff();
+static void resumeWifiDevice(ns3::Ptr<ns3::WifiNetDevice> device)
+{
+  device->GetPhy()->ResumeFromOff();
 }
 
 /*************
@@ -150,14 +151,10 @@ static void zoneCreation_cb(simgrid::s4u::NetZone const& zone) {
 
     const char* start_time = wifizone->get_property("start_time");
     int start_time_value = start_time ? atoi(start_time) : 0;
-    auto resume = [](ns3::Ptr<ns3::WifiNetDevice> device){device->GetPhy()->ResumeFromOff();};
-    for (int i = 0; i < netDevices.GetN(); i++) {
-        ns3::Ptr<ns3::WifiNetDevice> device = ns3::StaticCast<ns3::WifiNetDevice>(netDevices.Get(i));
-        device->GetPhy()->SetOffMode();
-        ns3::Simulator::Schedule(
-            ns3::Seconds(start_time_value),
-            &resumeWifiDevice,
-            device);
+    for (uint32_t i = 0; i < netDevices.GetN(); i++) {
+      ns3::Ptr<ns3::WifiNetDevice> device = ns3::StaticCast<ns3::WifiNetDevice>(netDevices.Get(i));
+      device->GetPhy()->SetOffMode();
+      ns3::Simulator::Schedule(ns3::Seconds(start_time_value), &resumeWifiDevice, device);
     }
 
     ns3::Config::Set("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", ns3::UintegerValue(40));
@@ -331,11 +328,11 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL)
   s4u::NetZone::on_seal.connect(&zoneCreation_cb);
 }
 
-LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
+LinkImpl* NetworkNS3Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
                                        s4u::Link::SharingPolicy policy)
 {
   xbt_assert(bandwidths.size() == 1, "ns-3 links must use only 1 bandwidth.");
-  return new LinkNS3(this, name, bandwidths[0], latency, policy);
+  return new LinkNS3(name, bandwidths[0], policy);
 }
 
 Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
@@ -435,14 +432,10 @@ 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, s4u::Link::SharingPolicy policy)
+    : LinkImpl(name), sharing_policy_(policy)
 {
   bandwidth_.peak = bandwidth;
-  latency_.peak   = latency;
-
-  s4u::Link::on_creation(*this->get_iface());
 }
 
 LinkNS3::~LinkNS3() = default;