Remove sg_platf_*_add_cb, use the signal<T> directly

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index b9c0d76..876546d 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -8,6 +8,7 @@
 #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;
@@ -23,19 +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);
 
-  hostCreatedCallbacks.connect([](Host*) {
+  simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host&) {
     host_number_int++;
   });
-  sg_platf_link_add_cb(netcste_parse_nolink);
+  simgrid::surf::on_link.connect(netcste_parse_nolink);
 
-  Model *model = surf_network_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;
@@ -82,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();
@@ -92,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;
 }
 
@@ -117,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;
-}
-