X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c7c27ceb7de4182a8e49520e76dce97ec4f3569..010f71b687b464c4765b980251300bb6007ae3a6:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 960e513f25..9a582d7a6f 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. 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. */
@@ -13,92 +12,81 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
  *********/
 void surf_network_model_init_Constant()
 {
-  xbt_assert(surf_network_model == NULL);
+  xbt_assert(surf_network_model == nullptr);
   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(netlink_parse_init);
+  all_existing_models->push_back(surf_network_model);
 }
 
 namespace simgrid {
-  namespace surf {
-
-    Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
-        xbt_dict_t properties) {
+namespace surf {
+LinkImpl* NetworkConstantModel::createLink(const std::string& 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;
-    }
+  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*/)
-    {
-      NetworkConstantAction *action = NULL;
-      double min = -1.0;
+double NetworkConstantModel::nextOccuringEvent(double /*now*/)
+{
+  double min = -1.0;
+  for (kernel::resource::Action const& action : *getRunningActionSet()) {
+    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;
+}
 
-      ActionList *actionSet = getRunningActionSet();
-      for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-          ; it != itend ; ++it) {
-        action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
-          min = action->latency_;
+void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
+{
+  for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) {
+    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.initialLatency_);
+    if (action.get_max_duration() != NO_MAX_DURATION)
+      action.update_max_duration(delta);
 
-      return min;
+    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);
     }
+  }
+}
 
-    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->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);
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+{
+  NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-        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);
-        }
-      }
-    }
+  simgrid::s4u::Link::onCommunicate(action, src, dst);
+  return action;
+}
 
-    Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst, double size, double rate)
-    {
-      NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
+/**********
+ * Action *
+ **********/
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
+    : NetworkAction(model_, size, false), initialLatency_(latency)
+{
+  latency_ = latency;
+  if (latency_ <= 0.0)
+    set_state(Action::State::done);
+};
 
-      Link::onCommunicate(action, src, dst);
-      return action;
-    }
+NetworkConstantAction::~NetworkConstantAction() = default;
 
-    /**********
-     * 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);
-      }
-    };
-  }
+void NetworkConstantAction::updateRemainingLazy(double /*now*/)
+{
+  THROW_IMPOSSIBLE;
+}
+}
 }