X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..0ed272aba22041443953a820a97523260375ebc4:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 65744733c9..b9c0d76ebc 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,11 +7,14 @@
 #include "network_constant.hpp"
 #include "surf/random_mgr.h"
 
+#include "host_interface.hpp"
+
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 static int host_number_int = 0;
 
-static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
-  host_number_int++;
+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')");
 }
 
 /*********
@@ -22,10 +25,15 @@ void surf_network_model_init_Constant()
   xbt_assert(surf_network_model == NULL);
   surf_network_model = new NetworkConstantModel();
 
-  sg_platf_host_add_cb(netcste_count_hosts);
+  routing_model_create(NULL);
+
+  hostCreatedCallbacks.connect([](Host*) {
+    host_number_int++;
+  });
+  sg_platf_link_add_cb(netcste_parse_nolink);
 
   Model *model = surf_network_model;
-  xbt_dynar_push(model_list, &model);
+  xbt_dynar_push(all_existing_models, &model);
 }
 
 double NetworkConstantModel::shareResources(double /*now*/)
@@ -88,38 +96,6 @@ Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
   return action;
 }
 
-/************
- * Resource *
- ************/
-bool NetworkConstantLink::isUsed()
-{
-  return 0;
-}
-
-void NetworkConstantLink::updateState(tmgr_trace_event_t /*event_type*/,
-                                         double /*value*/, double /*time*/)
-{
-  DIE_IMPOSSIBLE;
-}
-
-double NetworkConstantLink::getBandwidth()
-{
-  DIE_IMPOSSIBLE;
-  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
-double NetworkConstantLink::getLatency()
-{
-  DIE_IMPOSSIBLE;
-  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
-bool NetworkConstantLink::isShared()
-{
-  DIE_IMPOSSIBLE;
-  return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
 /**********
  * Action *
  **********/
@@ -128,7 +104,7 @@ int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-	if (actionHook::is_linked())
+	if (action_hook.is_linked())
 	  p_stateSet->erase(p_stateSet->iterator_to(*this));
     delete this;
   return 1;
@@ -141,7 +117,7 @@ void NetworkConstantAction::cancel()
   return;
 }
 
-void NetworkConstantAction::setCategory(const char */*category*/)
+void NetworkConstantAction::setCategory(const char * /*category*/)
 {
   //ignore completely the categories in constant model, they are not traced
 }
@@ -157,11 +133,6 @@ void NetworkConstantAction::resume()
 	m_suspended = false;
 }
 
-void NetworkConstantAction::recycle()
-{
-  return;
-}
-
 bool NetworkConstantAction::isSuspended()
 {
   return m_suspended;