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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index ce90e8ad18..c8a5bcb924 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,10 +1,11 @@
-/* Copyright (c) 2013-2015. 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,101 +14,85 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
  *********/
 void surf_network_model_init_Constant()
 {
-  xbt_assert(surf_network_model == NULL);
-  surf_network_model = new simgrid::surf::NetworkConstantModel();
-  xbt_dynar_push(all_existing_models, &surf_network_model);
-
-  routing_model_create(NULL);
-
-  simgrid::surf::on_link.connect([](sg_platf_link_cbarg_t link){
-    xbt_die("There is no link in the Constant network model. "
-        "Please remove any link from your platform (and switch to routing='None')");
-  });
+  xbt_assert(surf_network_model == nullptr);
+  surf_network_model = new simgrid::kernel::resource::NetworkConstantModel();
 }
 
 namespace simgrid {
-  namespace surf {
-
-    double NetworkConstantModel::next_occuring_event(double /*now*/)
-    {
-      NetworkConstantAction *action = NULL;
-      double min = -1.0;
+namespace kernel {
+namespace resource {
+NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL)
+{
+  all_existing_models.push_back(this);
+}
 
-      ActionList *actionSet = getRunningActionSet();
-      for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-          ; it != itend ; ++it) {
-        action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
-          min = action->m_latency;
-      }
+LinkImpl* NetworkConstantModel::create_link(const std::string& name, double, double, s4u::Link::SharingPolicy)
+{
 
-      return min;
-    }
+  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;
+}
 
-    void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
-    {
-      NetworkConstantAction *action = NULL;
-      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->m_latency > 0) {
-          if (action->m_latency > delta) {
-            double_update(&(action->m_latency), delta, sg_surf_precision);
-          } else {
-            action->m_latency = 0.0;
-          }
-        }
-        action->updateRemains(action->getCost() * delta / action->m_latInit);
-        if (action->getMaxDuration() != NO_MAX_DURATION)
-          action->updateMaxDuration(delta);
+double NetworkConstantModel::next_occuring_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);
+    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(SURF_ACTION_DONE);
-        } else if ((action->getMaxDuration() != NO_MAX_DURATION)
-            && (action->getMaxDuration() <= 0)) {
-          action->finish();
-          action->setState(SURF_ACTION_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());) {
+    NetworkConstantAction& 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 / action.initial_latency_);
+    action.update_max_duration(delta);
 
-    Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-        double size, double rate)
-    {
-      char *src_name = src->name();
-      char *dst_name = dst->name();
-
-      XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
-      NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
-      XBT_OUT();
-
-      networkCommunicateCallbacks(action, src, dst, size, rate);
-      return action;
+    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::FINISHED);
     }
+  }
+}
 
-    /**********
-     * Action *
-     **********/
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double)
+{
+  NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-    int NetworkConstantAction::unref()
-    {
-      m_refcount--;
-      if (!m_refcount) {
-        if (action_hook.is_linked())
-          p_stateSet->erase(p_stateSet->iterator_to(*this));
-        delete this;
-        return 1;
-      }
-      return 0;
-    }
+  simgrid::s4u::Link::on_communicate(action, src, dst);
+  return action;
+}
 
-    void NetworkConstantAction::cancel()
-    {
-      return;
-    }
+/**********
+ * Action *
+ **********/
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
+    : NetworkAction(model_, size, false), initial_latency_(latency)
+{
+  latency_ = latency;
+  if (latency_ <= 0.0)
+    NetworkConstantAction::set_state(Action::State::FINISHED);
+};
 
-  }
+NetworkConstantAction::~NetworkConstantAction() = default;
+
+void NetworkConstantAction::update_remains_lazy(double /*now*/)
+{
+  THROW_IMPOSSIBLE;
+}
+}
+} // namespace kernel
 }