X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6cc4e43479c46e58586d91af850f5420f4d77312..4be8e24c6d490dfbca2fe7e62da90202065d9d03:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 111988202e..876546d1b4 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -7,12 +7,12 @@
 #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_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')");
@@ -24,17 +24,22 @@ static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
 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);
-  sg_platf_link_add_cb(netcste_parse_nolink);
+  simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host&) {
+    host_number_int++;
+  });
+  simgrid::surf::on_link.connect(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;
@@ -81,7 +86,7 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
   }
 }
 
-Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
 		                         double size, double rate)
 {
   char *src_name = src->getName();
@@ -91,7 +96,7 @@ 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;
 }
 
@@ -103,7 +108,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;
@@ -116,24 +121,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;
-}
-