remove model from Link constructors

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

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 71126721dc75696003ebe3d51beda69991961163..5799ac2a6c040f63d7c58261275c00c77e5c2a6b 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -59,8 +59,8 @@ NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
   set_maxmin_system(sys);
   loopback_ = NetworkL07Model::create_link("__loopback__", 
                                             std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
-                                            simgrid::config::get_value<double>("network/loopback-lat"),
-                                            s4u::Link::SharingPolicy::FATPIPE);
+                                            s4u::Link::SharingPolicy::FATPIPE)->set_latency(simgrid::config::get_value<double>("network/loopback-lat"));
+  loopback_->seal();
 }
 
 NetworkL07Model::~NetworkL07Model()
@@ -228,10 +228,10 @@ kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vecto
 }
 
 kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, const std::vector<double>& bandwidths,
-                                                         double latency, s4u::Link::SharingPolicy policy)
+                                                         s4u::Link::SharingPolicy policy)
 {
   xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth.");
-  return new LinkL07(this, name, bandwidths[0], latency, policy);
+  return new LinkL07(name, bandwidths[0], policy, get_maxmin_system());
 }
 
 /************
@@ -239,29 +239,27 @@ kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name
  ************/
 
 CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
-    : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate.front()), speed_per_pstate,
-          core)
+    : Cpu(host, speed_per_pstate)
 {
+  this->set_core_count(core)->set_model(model)->set_constraint(
+      model->get_maxmin_system()->constraint_new(this, speed_per_pstate.front()));
 }
 
 CpuL07::~CpuL07()=default;
 
-LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
-                 s4u::Link::SharingPolicy policy)
-    : LinkImpl(model, name, model->get_maxmin_system()->constraint_new(this, bandwidth))
+LinkL07::LinkL07(const std::string& name, double bandwidth, s4u::Link::SharingPolicy policy,
+                 kernel::lmm::System* system)
+    : LinkImpl(name, system->constraint_new(this, bandwidth))
 {
   bandwidth_.peak = bandwidth;
-  latency_.peak   = latency;
 
   if (policy == s4u::Link::SharingPolicy::FATPIPE)
     get_constraint()->unshare();
-
-  s4u::Link::on_creation(*get_iface());
 }
 
 kernel::resource::CpuAction* CpuL07::execution_start(double size)
 {
-  std::vector<s4u::Host*> host_list = {get_host()};
+  std::vector<s4u::Host*> host_list = {get_iface()};
 
   auto* flops_amount = new double[host_list.size()]();
   flops_amount[0] = size;
@@ -319,11 +317,11 @@ void CpuL07::apply_event(kernel::profile::Event* triggered, double value)
   } else if (triggered == state_event_) {
     if (value > 0) {
       if (not is_on()) {
-        XBT_VERB("Restart actors on host %s", get_host()->get_cname());
-        get_host()->turn_on();
+        XBT_VERB("Restart actors on host %s", get_iface()->get_cname());
+        get_iface()->turn_on();
       }
     } else
-      get_host()->turn_off();
+      get_iface()->turn_off();
     tmgr_trace_event_unref(&state_event_);
 
   } else {
@@ -362,8 +360,9 @@ void LinkL07::set_bandwidth(double value)
   get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale);
 }
 
-void LinkL07::set_latency(double value)
+kernel::resource::LinkImpl* LinkL07::set_latency(double value)
 {
+  latency_check(value);
   const kernel::lmm::Variable* var;
   L07Action *action;
   const kernel::lmm::Element* elem = nullptr;
@@ -373,6 +372,7 @@ void LinkL07::set_latency(double value)
     action = static_cast<L07Action*>(var->get_id());
     action->updateBound();
   }
+  return this;
 }
 LinkL07::~LinkL07() = default;
 
@@ -417,5 +417,5 @@ void L07Action::updateBound()
   }
 }
 
-}
-}
+} // namespace surf
+} // namespace simgrid