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 47f923f..876546d 100644 (file)
--- 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,15 @@
 #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')");
 }
 
 /*********
@@ -20,14 +24,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::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;
@@ -74,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();
@@ -84,42 +96,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 +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;
@@ -141,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;
-}
-