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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index f9ffcb6761..77488ace5a 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -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')");
 }
 
 /*********
@@ -20,14 +23,22 @@ static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
 void surf_network_model_init_Constant()
 {
   xbt_assert(surf_network_model == NULL);
-  surf_network_model = new NetworkConstantModel();
+  surf_network_model = new simgrid::surf::NetworkConstantModel();
+
+  routing_model_create(NULL);
 
-  sg_platf_host_add_cb(netcste_count_hosts);
+  simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
+    host_number_int++;
+  });
+  sg_platf_link_add_cb(netcste_parse_nolink);
 
-  Model *model = surf_network_model;
-  xbt_dynar_push(model_list, &model);
+  simgrid::surf::Model *model = surf_network_model;
+  xbt_dynar_push(all_existing_models, &model);
 }
 
+namespace simgrid {
+namespace surf {
+
 double NetworkConstantModel::shareResources(double /*now*/)
 {
   NetworkConstantAction *action = NULL;
@@ -84,42 +95,10 @@ Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
   NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
   XBT_OUT();
 
-  surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
+  networkCommunicateCallbacks(action, src, dst, size, rate);
   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 +107,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 +120,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
 }
@@ -162,3 +141,5 @@ bool NetworkConstantAction::isSuspended()
   return m_suspended;
 }
 
+}
+}