From: SUTER Frederic <frederic.suter@cc.in2p3.fr>
Date: Fri, 2 Apr 2021 15:41:11 +0000 (+0200)
Subject: simplify constant model a bit
X-Git-Tag: v3.28~482^2~27
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/38827683d04668760669be00ad72ec0e5d6ad5dc

simplify constant model a bit
---

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 9dc68e879c..65098c78f8 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -58,7 +58,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
         action.latency_ = 0.0;
       }
     }
-    action.update_remains(action.get_cost() * delta / action.initial_latency_);
+    action.update_remains(action.get_cost() * delta / sg_latency_factor);
     action.update_max_duration(delta);
 
     if ((action.get_remains_no_update() <= 0) ||
@@ -70,7 +70,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
 
 Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/)
 {
-  auto* action = new NetworkConstantAction(this, *src, *dst, size, sg_latency_factor);
+  auto* action = new NetworkConstantAction(this, *src, *dst, size);
 
   s4u::Link::on_communicate(*action);
   return action;
@@ -79,11 +79,10 @@ Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double
 /**********
  * Action *
  **********/
-NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size,
-                                             double latency)
-    : NetworkAction(model_, src, dst, size, false), initial_latency_(latency)
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size)
+    : NetworkAction(model_, src, dst, size, false)
 {
-  latency_ = latency;
+  latency_ = sg_latency_factor;
   if (latency_ <= 0.0)
     NetworkConstantAction::set_state(Action::State::FINISHED);
 }
diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index d60f9b6abc..1dfb40a0c8 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -27,9 +27,8 @@ public:
 
 class NetworkConstantAction : public NetworkAction {
 public:
-  NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size, double latency);
+  NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size);
   ~NetworkConstantAction() override;
-  double initial_latency_;
   void update_remains_lazy(double now) override;
 };