-/* 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
#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')");
}
/*********
xbt_assert(surf_network_model == NULL);
surf_network_model = new NetworkConstantModel();
- sg_platf_host_add_cb(netcste_count_hosts);
+ routing_model_create(NULL);
+
+ hostCreatedCallbacks.connect([](Host*) {
+ host_number_int++;
+ });
+ sg_platf_link_add_cb(netcste_parse_nolink);
Model *model = surf_network_model;
- xbt_dynar_push(model_list, &model);
+ xbt_dynar_push(all_existing_models, &model);
}
double NetworkConstantModel::shareResources(double /*now*/)
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 *
**********/
{
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;
return;
}
-void NetworkConstantAction::setCategory(const char */*category*/)
+void NetworkConstantAction::setCategory(const char * /*category*/)
{
//ignore completely the categories in constant model, they are not traced
}
m_suspended = false;
}
-void NetworkConstantAction::recycle()
-{
- return;
-}
-
bool NetworkConstantAction::isSuspended()
{
return m_suspended;