X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..090f69e16fc2256292aa7ca819b9d80a2a51d8d4:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index ad2f6e0531..5bd7210ba1 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,34 +1,32 @@
-/* Copyright (c) 2013-2020. 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. */
 
 #include "network_constant.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 /*********
  * Model *
  *********/
 void surf_network_model_init_Constant()
 {
-  xbt_assert(surf_network_model == nullptr);
-  surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkConstantModel>("Network_Constant");
+  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
 }
 
 namespace simgrid {
 namespace kernel {
 namespace resource {
 
-NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
-{
-  all_existing_models.push_back(this);
-}
-
-LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/,
-                                            double /*latency*/, s4u::Link::SharingPolicy)
+LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector<double>& /*bandwidth*/)
 {
   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')",
@@ -36,10 +34,15 @@ LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::
   return nullptr;
 }
 
+LinkImpl* NetworkConstantModel::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
+{
+  return create_link(name, bandwidths);
+}
+
 double NetworkConstantModel::next_occurring_event(double /*now*/)
 {
   double min = -1.0;
-  for (kernel::resource::Action const& action : *get_started_action_set()) {
+  for (Action const& action : *get_started_action_set()) {
     const auto& net_action = static_cast<const NetworkConstantAction&>(action);
     if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
       min = net_action.latency_;
@@ -59,7 +62,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) ||
@@ -69,27 +72,25 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
   }
 }
 
-Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
+Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/)
 {
-  auto* action = new NetworkConstantAction(this, size, sg_latency_factor);
+  auto* action = new NetworkConstantAction(this, *src, *dst, size);
 
-  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)
+    : NetworkAction(model_, src, dst, size, false)
 {
-  latency_ = latency;
+  latency_ = sg_latency_factor;
   if (latency_ <= 0.0)
-    NetworkConstantAction::set_state(Action::State::FINISHED);
+    set_state(Action::State::FINISHED);
 }
 
-NetworkConstantAction::~NetworkConstantAction() = default;
-
 void NetworkConstantAction::update_remains_lazy(double /*now*/)
 {
   THROW_IMPOSSIBLE;