-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
-#include "surf/random_mgr.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static int host_number_int = 0;
+#include "host_interface.hpp"
+#include "src/surf/platform.hpp"
-static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
- host_number_int++;
-}
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
/*********
* Model *
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
- surf_network_model = new NetworkConstantModel();
+ surf_network_model = new simgrid::surf::NetworkConstantModel();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
- sg_platf_host_add_cb(netcste_count_hosts);
+ routing_model_create(NULL);
- ModelPtr model = static_cast<ModelPtr>(surf_network_model);
- xbt_dynar_push(model_list, &model);
+ simgrid::surf::on_link.connect([](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')");
+ });
}
+namespace simgrid {
+namespace surf {
+
double NetworkConstantModel::shareResources(double /*now*/)
{
- NetworkConstantActionPtr action = NULL;
+ NetworkConstantAction *action = NULL;
double min = -1.0;
- ActionListPtr actionSet = getRunningActionSet();
+ ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
- ; it != itend ; ++it) {
- action = static_cast<NetworkConstantActionPtr>(&*it);
- if (action->m_latency > 0) {
- if (min < 0)
- min = action->m_latency;
- else if (action->m_latency < min)
- min = action->m_latency;
- }
+ ; it != itend ; ++it) {
+ action = static_cast<NetworkConstantAction*>(&*it);
+ if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+ min = action->m_latency;
}
return min;
void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
{
- NetworkConstantActionPtr action = NULL;
- ActionListPtr actionSet = getRunningActionSet();
+ NetworkConstantAction *action = NULL;
+ ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
+ ; it != itend ; it=itNext) {
++itNext;
- action = static_cast<NetworkConstantActionPtr>(&*it);
+ action = static_cast<NetworkConstantAction*>(&*it);
if (action->m_latency > 0) {
if (action->m_latency > delta) {
- double_update(&(action->m_latency), delta);
+ double_update(&(action->m_latency), delta, sg_surf_precision);
} else {
action->m_latency = 0.0;
}
action->finish();
action->setState(SURF_ACTION_DONE);
} else if ((action->getMaxDuration() != NO_MAX_DURATION)
- && (action->getMaxDuration() <= 0)) {
+ && (action->getMaxDuration() <= 0)) {
action->finish();
action->setState(SURF_ACTION_DONE);
}
}
}
-ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
- double size, double rate)
+Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
+ double size, double rate)
{
char *src_name = src->getName();
char *dst_name = dst->getName();
XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
- NetworkConstantActionPtr action = new NetworkConstantAction(this, size, sg_latency_factor);
+ 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 *
**********/
{
m_refcount--;
if (!m_refcount) {
- if (actionHook::is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ if (action_hook.is_linked())
+ p_stateSet->erase(p_stateSet->iterator_to(*this));
delete this;
- return 1;
+ return 1;
}
return 0;
}
return;
}
-#ifdef HAVE_TRACING
-void NetworkConstantAction::setCategory(const char */*category*/)
-{
- //ignore completely the categories in constant model, they are not traced
-}
-#endif
-
-void NetworkConstantAction::suspend()
-{
- m_suspended = true;
-}
-
-void NetworkConstantAction::resume()
-{
- if (m_suspended)
- m_suspended = false;
}
-
-void NetworkConstantAction::recycle()
-{
- return;
}
-
-bool NetworkConstantAction::isSuspended()
-{
- return m_suspended;
-}
-