Update copyright lines.

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 9227e57..2de53a3 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. 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. */
@@ -30,18 +30,17 @@ NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::F
 LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/,
                                             double /*latency*/, s4u::Link::SharingPolicy)
 {
-
   xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
           "Please remove any link from your platform (and switch to routing='None')",
           name.c_str());
   return nullptr;
 }
 
-double NetworkConstantModel::next_occuring_event(double /*now*/)
+double NetworkConstantModel::next_occurring_event(double /*now*/)
 {
   double min = -1.0;
   for (kernel::resource::Action const& action : *get_started_action_set()) {
-    const NetworkConstantAction& net_action = static_cast<const NetworkConstantAction&>(action);
+    const auto& net_action = static_cast<const NetworkConstantAction&>(action);
     if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
       min = net_action.latency_;
   }
@@ -51,7 +50,7 @@ double NetworkConstantModel::next_occuring_event(double /*now*/)
 void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
 {
   for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
-    NetworkConstantAction& action = static_cast<NetworkConstantAction&>(*it);
+    auto& action = static_cast<NetworkConstantAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
     if (action.latency_ > 0) {
       if (action.latency_ > delta) {
@@ -72,22 +71,23 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
 
 Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
 {
-  NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
+  auto* action = new NetworkConstantAction(this, *src, *dst, size, sg_latency_factor);
 
-  s4u::Link::on_communicate(*action, src, dst);
+  s4u::Link::on_communicate(*action);
   return action;
 }
 
 /**********
  * Action *
  **********/
-NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
-    : NetworkAction(model_, size, false), initial_latency_(latency)
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size,
+                                             double latency)
+    : NetworkAction(model_, src, dst, size, false), initial_latency_(latency)
 {
   latency_ = latency;
   if (latency_ <= 0.0)
     NetworkConstantAction::set_state(Action::State::FINISHED);
-};
+}
 
 NetworkConstantAction::~NetworkConstantAction() = default;