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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 6114f6f4d1..dcbc87f1d0 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,14 +1,10 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. 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 "host_interface.hpp"
-#include "src/surf/platform.hpp"
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /*********
@@ -16,32 +12,34 @@ 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([](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')");
-  });
+  all_existing_models->push_back(surf_network_model);
 }
 
 namespace simgrid {
 namespace surf {
+LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
+                                           e_surf_link_sharing_policy_t policy)
+{
 
-double NetworkConstantModel::next_occuring_event(double /*now*/)
+  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::nextOccuringEvent(double /*now*/)
 {
-  NetworkConstantAction *action = NULL;
   double min = -1.0;
 
-  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;
+  ActionList* actionSet = getRunningActionSet();
+  ActionList::iterator it(actionSet->begin());
+  ActionList::iterator itend(actionSet->end());
+  for (; it != itend; ++it) {
+    NetworkConstantAction* action = static_cast<NetworkConstantAction*>(&*it);
+    if (action->latency_ > 0 && (min < 0 || action->latency_ < min))
+      min = action->latency_;
   }
 
   return min;
@@ -49,68 +47,53 @@ double NetworkConstantModel::next_occuring_event(double /*now*/)
 
 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) {
+  NetworkConstantAction* action = nullptr;
+  ActionList* actionSet         = getRunningActionSet();
+  ActionList::iterator it(actionSet->begin());
+  ActionList::iterator itNext = it;
+  ActionList::iterator itend(actionSet->end());
+  for (; 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);
+    if (action->latency_ > 0) {
+      if (action->latency_ > delta) {
+        double_update(&(action->latency_), delta, sg_surf_precision);
       } else {
-        action->m_latency = 0.0;
+        action->latency_ = 0.0;
       }
     }
-    action->updateRemains(action->getCost() * delta / action->m_latInit);
+    action->updateRemains(action->getCost() * delta / action->initialLatency_);
     if (action->getMaxDuration() != NO_MAX_DURATION)
       action->updateMaxDuration(delta);
 
-    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);
+    if (((action->getRemainsNoUpdate() <= 0) ||
+         ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0)))) {
+      action->finish(Action::State::done);
     }
   }
 }
 
-Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-    double size, double rate)
+Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
 {
-  char *src_name = src->name();
-  char *dst_name = dst->name();
+  NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-  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);
+  simgrid::s4u::Link::onCommunicate(action, src, dst);
   return action;
 }
 
 /**********
  * Action *
  **********/
-
-int NetworkConstantAction::unref()
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
+    : NetworkAction(model_, size, false), initialLatency_(latency)
 {
-  m_refcount--;
-  if (!m_refcount) {
-    if (action_hook.is_linked())
-      p_stateSet->erase(p_stateSet->iterator_to(*this));
-    delete this;
-    return 1;
+  latency_ = latency;
+  if (latency_ <= 0.0) {
+    stateSet_ = model_->getDoneActionSet();
+    stateSet_->push_back(*this);
   }
-  return 0;
-}
-
-void NetworkConstantAction::cancel()
-{
-  return;
-}
+};
 
+NetworkConstantAction::~NetworkConstantAction() = default;
 }
 }