X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b29f2bc452ad2be0c7285e98f3bf7026d0ce6d..255700918582111f0aacaa7b7fed87dcedc1a840:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index bbf16a8372..b786a20b97 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,103 +1,99 @@
-/* Copyright (c) 2013-2015. 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>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+#include "src/kernel/EngineImpl.hpp"
+#include "src/surf/network_constant.hpp"
+#include "src/surf/surf_interface.hpp"
+
+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::surf::NetworkConstantModel();
-  all_existing_models->push_back(surf_network_model);
-
-  routing_model_create();
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkConstantModel>("Network_Constant");
+  auto* engine   = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(net_model);
+  engine->get_netzone_root()->set_network_model(net_model);
 }
 
 namespace simgrid {
-  namespace surf {
-  Link* NetworkConstantModel::createLink(const char* name, double bw, double lat, e_surf_link_sharing_policy_t policy)
-  {
-
-    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);
-    return nullptr;
-    }
+namespace kernel {
+namespace resource {
 
-    double NetworkConstantModel::nextOccuringEvent(double /*now*/)
-    {
-      double min = -1.0;
-
-      ActionList *actionSet = getRunningActionSet();
-      for(auto it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) {
-        NetworkConstantAction *action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
-          min = action->latency_;
-      }
+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')",
+          name.c_str());
+  return nullptr;
+}
 
-      return min;
-    }
+LinkImpl* NetworkConstantModel::create_wifi_link(const std::string& name, const std::vector<double>& bandwidths)
+{
+  return create_link(name, bandwidths);
+}
 
-    void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
-    {
-      NetworkConstantAction *action = nullptr;
-      ActionList *actionSet = getRunningActionSet();
-      for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
-          ; it != itend ; it=itNext) {
-        ++itNext;
-        action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->latency_ > 0) {
-          if (action->latency_ > delta) {
-            double_update(&(action->latency_), delta, sg_surf_precision);
-          } else {
-            action->latency_ = 0.0;
-          }
-        }
-        action->updateRemains(action->getCost() * delta / action->initialLatency_);
-        if (action->getMaxDuration() != NO_MAX_DURATION)
-          action->updateMaxDuration(delta);
+double NetworkConstantModel::next_occurring_event(double /*now*/)
+{
+  double min = -1.0;
+  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_;
+  }
+  return min;
+}
 
-        if (action->getRemainsNoUpdate() <= 0) {
-          action->finish();
-          action->setState(Action::State::done);
-        } else if ((action->getMaxDuration() != NO_MAX_DURATION)
-            && (action->getMaxDuration() <= 0)) {
-          action->finish();
-          action->setState(Action::State::done);
-        }
+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());) {
+    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) {
+        double_update(&action.latency_, delta, sg_surf_precision);
+      } else {
+        action.latency_ = 0.0;
       }
     }
+    action.update_remains(action.get_cost() * delta / sg_latency_factor);
+    action.update_max_duration(delta);
 
-    Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
-    {
-      NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
-
-      Link::onCommunicate(action, src, dst);
-      return action;
+    if ((action.get_remains_no_update() <= 0) ||
+        ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+      action.finish(Action::State::FINISHED);
     }
+  }
+}
 
-    /**********
-     * Action *
-     **********/
-    NetworkConstantAction::NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
-    : NetworkAction(model_, size, false)
-    , initialLatency_(latency)
-    {
-      latency_ = latency;
-      if (latency_ <= 0.0) {
-        stateSet_ = getModel()->getDoneActionSet();
-        stateSet_->push_back(*this);
-      }
-    };
+Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/)
+{
+  return (new NetworkConstantAction(this, *src, *dst, size));
+}
 
-    NetworkConstantAction::~NetworkConstantAction() {}
+/**********
+ * Action *
+ **********/
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size)
+    : NetworkAction(model_, src, dst, size, false)
+{
+  latency_ = sg_latency_factor;
+  if (latency_ <= 0.0)
+    set_state(Action::State::FINISHED);
+}
 
-  }
+void NetworkConstantAction::update_remains_lazy(double /*now*/)
+{
+  THROW_IMPOSSIBLE;
 }
+
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid