X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e97c8f1b5222937830d342336f137e43ba00325..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 7dd7d45247..c8a5bcb924 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,9 +1,11 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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 "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
@@ -13,14 +15,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 void surf_network_model_init_Constant()
 {
   xbt_assert(surf_network_model == nullptr);
-  surf_network_model = new simgrid::surf::NetworkConstantModel();
-  all_existing_models->push_back(surf_network_model);
+  surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
 }
 
 namespace simgrid {
-namespace surf {
-LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
-                                           e_surf_link_sharing_policy_t policy)
+namespace kernel {
+namespace resource {
+NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
+{
+  all_existing_models.push_back(this);
+}
+
+LinkImpl* NetworkConstantModel::create_link(const std::string& name, double, double, s4u::Link::SharingPolicy)
 {
 
   xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
@@ -32,7 +38,7 @@ LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, d
 double NetworkConstantModel::next_occuring_event(double /*now*/)
 {
   double min = -1.0;
-  for (kernel::resource::Action const& action : *get_running_action_set()) {
+  for (kernel::resource::Action const& action : *get_started_action_set()) {
     const NetworkConstantAction& net_action = static_cast<const NetworkConstantAction&>(action);
     if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
       min = net_action.latency_;
@@ -42,7 +48,7 @@ double NetworkConstantModel::next_occuring_event(double /*now*/)
 
 void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
 {
-  for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+  for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
     NetworkConstantAction& action = static_cast<NetworkConstantAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
     if (action.latency_ > 0) {
@@ -52,22 +58,21 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
         action.latency_ = 0.0;
       }
     }
-    action.update_remains(action.get_cost() * delta / action.initialLatency_);
-    if (action.get_max_duration() != NO_MAX_DURATION)
-      action.update_max_duration(delta);
+    action.update_remains(action.get_cost() * delta / action.initial_latency_);
+    action.update_max_duration(delta);
 
     if ((action.get_remains_no_update() <= 0) ||
         ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
-      action.finish(kernel::resource::Action::State::done);
+      action.finish(kernel::resource::Action::State::FINISHED);
     }
   }
 }
 
-kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
 {
   NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-  simgrid::s4u::Link::onCommunicate(action, src, dst);
+  simgrid::s4u::Link::on_communicate(action, src, dst);
   return action;
 }
 
@@ -75,11 +80,11 @@ kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u:
  * Action *
  **********/
 NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
-    : NetworkAction(model_, size, false), initialLatency_(latency)
+    : NetworkAction(model_, size, false), initial_latency_(latency)
 {
   latency_ = latency;
   if (latency_ <= 0.0)
-    NetworkConstantAction::set_state(Action::State::done);
+    NetworkConstantAction::set_state(Action::State::FINISHED);
 };
 
 NetworkConstantAction::~NetworkConstantAction() = default;
@@ -89,4 +94,5 @@ void NetworkConstantAction::update_remains_lazy(double /*now*/)
   THROW_IMPOSSIBLE;
 }
 }
+} // namespace kernel
 }