ns3: no need for 2 postparse callbacks

[simgrid.git] / src / surf / network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 0e2b4b7..e68c91d 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -6,9 +6,6 @@
 
 #include "network_constant.hpp"
 
-#include "host_interface.hpp"
-#include "src/surf/platform.hpp"
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /*********
@@ -22,95 +19,99 @@ void surf_network_model_init_Constant()
 
   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')");
-  });
+  simgrid::surf::on_link.connect(netlink_parse_init);
 }
 
 namespace simgrid {
-namespace surf {
+  namespace surf {
 
-double NetworkConstantModel::shareResources(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);
+    }
 
-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_;
       }
+
+      return min;
     }
-    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);
+
+    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->m_latInit);
+        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);
+        }
+      }
     }
-  }
-}
 
-Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-                             double size, double rate)
-{
-  char *src_name = src->getName();
-  char *dst_name = dst->getName();
+    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();
+      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;
-}
-
-/**********
- * Action *
- **********/
+      networkCommunicateCallbacks(action, src, dst, size, rate);
+      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;
-  }
-  return 0;
-}
+    /**********
+     * 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;
+      }
+      return 0;
+    }
 
-void NetworkConstantAction::cancel()
-{
-  return;
-}
+    void NetworkConstantAction::cancel()
+    {
+      return;
+    }
 
-}
+  }
 }