Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 47f923f..3421c67 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
@@ -13,6 +13,10 @@ 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')");
+}
 
 /*********
  * Model *
@@ -22,7 +26,10 @@ void surf_network_model_init_Constant()
   xbt_assert(surf_network_model == NULL);
   surf_network_model = new NetworkConstantModel();
 
+  routing_model_create(NULL);
+
   sg_platf_host_add_cb(netcste_count_hosts);
+  sg_platf_link_add_cb(netcste_parse_nolink);
 
   Model *model = surf_network_model;
   xbt_dynar_push(model_list, &model);
@@ -88,38 +95,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 +103,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 +116,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
 }