X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..578dd56a4a07709db1922ff5edd98f0c8f3090f9:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 533be80bd1..1872ae1912 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -18,96 +18,85 @@ void surf_network_model_init_Constant()
   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')");
-  });
 }
 
 namespace simgrid {
-namespace surf {
+  namespace surf {
 
-double NetworkConstantModel::next_occuring_event(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;
-  }
+    Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy,
+        xbt_dict_t properties) {
 
-  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);
+      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;
+    double NetworkConstantModel::next_occuring_event(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->latency_ > 0 && (min < 0 || action->latency_ < min))
+          min = action->latency_;
       }
-    }
-    action->updateRemains(action->getCost() * delta / action->m_latInit);
-    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);
-    }
-  }
-}
 
-Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-    double size, double rate)
-{
-  char *src_name = src->name();
-  char *dst_name = dst->name();
+      return min;
+    }
 
-  XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
-  NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
-  XBT_OUT();
+    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);
+
+        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);
+        }
+      }
+    }
 
-  networkCommunicateCallbacks(action, src, dst, size, rate);
-  return action;
-}
+    Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst, double size, double rate)
+    {
+      NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
 
-/**********
- * Action *
- **********/
+      Link::onCommunicate(action, src, dst);
+      return action;
+    }
 
-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;
+    /**********
+     * 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);
+      }
+    };
   }
-  return 0;
-}
-
-void NetworkConstantAction::cancel()
-{
-  return;
-}
-
-}
 }