sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 0d90ff7..0e2b4b7 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -5,17 +5,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "network_constant.hpp"
-#include "surf/random_mgr.h"
 
 #include "host_interface.hpp"
+#include "src/surf/platform.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static int host_number_int = 0;
-
-static void netcste_parse_nolink(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')");
-}
 
 /*********
  * Model *
@@ -24,16 +18,14 @@ 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::Host::onCreation.connect([](simgrid::surf::Host*) {
-    host_number_int++;
+  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')");
   });
-  sg_platf_link_add_cb(netcste_parse_nolink);
-
-  simgrid::surf::Model *model = surf_network_model;
-  xbt_dynar_push(all_existing_models, &model);
 }
 
 namespace simgrid {
@@ -46,8 +38,8 @@ double NetworkConstantModel::shareResources(double /*now*/)
 
   ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-        ; it != itend ; ++it) {
-       action = static_cast<NetworkConstantAction*>(&*it);
+   ; it != itend ; ++it) {
+  action = static_cast<NetworkConstantAction*>(&*it);
         if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
             min = action->m_latency;
   }
@@ -62,7 +54,7 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
   for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
      ; it != itend ; it=itNext) {
     ++itNext;
-       action = static_cast<NetworkConstantAction*>(&*it);
+  action = static_cast<NetworkConstantAction*>(&*it);
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
         double_update(&(action->m_latency), delta, sg_surf_precision);
@@ -86,7 +78,7 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 }
 
 Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-                                        double size, double rate)
+                             double size, double rate)
 {
   char *src_name = src->getName();
   char *dst_name = dst->getName();
@@ -107,8 +99,8 @@ int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-       if (action_hook.is_linked())
-         p_stateSet->erase(p_stateSet->iterator_to(*this));
+  if (action_hook.is_linked())
+    p_stateSet->erase(p_stateSet->iterator_to(*this));
     delete this;
   return 1;
   }
@@ -120,26 +112,5 @@ void NetworkConstantAction::cancel()
   return;
 }
 
-void NetworkConstantAction::setCategory(const char * /*category*/)
-{
-  //ignore completely the categories in constant model, they are not traced
-}
-
-void NetworkConstantAction::suspend()
-{
-  m_suspended = true;
-}
-
-void NetworkConstantAction::resume()
-{
-  if (m_suspended)
-       m_suspended = false;
-}
-
-bool NetworkConstantAction::isSuspended()
-{
-  return m_suspended;
-}
-
 }
 }