X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..e597737e01b6ac76d6e9ccdf67a85c03c53de7c3:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 13fff27765..e68c91d532 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,12 +1,12 @@ +/* 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; - -static void netcste_count_hosts(sg_platf_host_cbarg_t h) { - host_number_int++; -} /********* * Model * @@ -14,155 +14,104 @@ 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(); - - sg_platf_host_add_cb(netcste_count_hosts); - - ModelPtr model = static_cast(surf_network_model); - xbt_dynar_push(model_list, &model); + surf_network_model = new simgrid::surf::NetworkConstantModel(); + xbt_dynar_push(all_existing_models, &surf_network_model); routing_model_create(NULL); + + simgrid::surf::on_link.connect(netlink_parse_init); } -double NetworkConstantModel::shareResources(double now) -{ - void *_action = NULL; - NetworkConstantActionLmmPtr action = NULL; - double min = -1.0; - - xbt_swag_foreach(_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); - if (action->m_latency > 0) { - if (min < 0) - min = action->m_latency; - else if (action->m_latency < min) - min = action->m_latency; - } - } +namespace simgrid { + namespace surf { - return min; -} + Link* NetworkConstantModel::createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, + xbt_dict_t properties) { -void NetworkConstantModel::updateActionsState(double now, double delta) -{ - void *_action, *_next_action; - NetworkConstantActionLmmPtr action = NULL; - - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = dynamic_cast(static_cast(_action)); - if (action->m_latency > 0) { - if (action->m_latency > delta) { - double_update(&(action->m_latency), delta); - } else { - action->m_latency = 0.0; - } - } - double_update(&(action->m_remains), - action->m_cost * delta / action->m_latInit); - if (action->m_maxDuration != NO_MAX_DURATION) - double_update(&(action->m_maxDuration), delta); - - if (action->m_remains <= 0) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); - } else if ((action->m_maxDuration != NO_MAX_DURATION) - && (action->m_maxDuration <= 0)) { - action->m_finish = surf_get_clock(); - action->setState(SURF_ACTION_DONE); + xbt_die("Refusing to create the link %s: there is no link in the Constant network model. " + "Please remove any link from your platform (and switch to routing='None')", name); } - } -} - -ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, - double size, double rate) -{ - char *src_name = src->p_name; - char *dst_name = dst->p_name; - XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); - NetworkConstantActionLmmPtr action = new NetworkConstantActionLmm(this, sg_latency_factor); - XBT_OUT(); + double NetworkConstantModel::next_occuring_event(double /*now*/) + { + NetworkConstantAction *action = NULL; + double min = -1.0; + + ActionList *actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) + ; it != itend ; ++it) { + action = static_cast(&*it); + if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) + min = action->latency_; + } - return action; -} + return min; + } -/************ - * Resource * - ************/ -bool NetworkConstantLinkLmm::isUsed() -{ - return 0; -} + void NetworkConstantModel::updateActionsState(double /*now*/, double delta) + { + NetworkConstantAction *action = NULL; + ActionList *actionSet = getRunningActionSet(); + for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end()) + ; it != itend ; it=itNext) { + ++itNext; + action = static_cast(&*it); + if (action->latency_ > 0) { + if (action->latency_ > delta) { + double_update(&(action->latency_), delta, sg_surf_precision); + } else { + action->latency_ = 0.0; + } + } + action->updateRemains(action->getCost() * delta / action->m_latInit); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(delta); + + if (action->getRemainsNoUpdate() <= 0) { + action->finish(); + action->setState(Action::State::done); + } else if ((action->getMaxDuration() != NO_MAX_DURATION) + && (action->getMaxDuration() <= 0)) { + action->finish(); + action->setState(Action::State::done); + } + } + } -void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t event_type, - double value, double time) -{ - DIE_IMPOSSIBLE; -} + Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst, + double size, double rate) + { + char *src_name = src->name(); + char *dst_name = dst->name(); -double NetworkConstantLinkLmm::getBandwidth() -{ - DIE_IMPOSSIBLE; - return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} + XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); + NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor); + XBT_OUT(); -double NetworkConstantLinkLmm::getLatency() -{ - DIE_IMPOSSIBLE; - return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} + networkCommunicateCallbacks(action, src, dst, size, rate); + return action; + } -bool NetworkConstantLinkLmm::isShared() -{ - DIE_IMPOSSIBLE; - return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} + /********** + * Action * + **********/ + + int NetworkConstantAction::unref() + { + m_refcount--; + if (!m_refcount) { + if (action_hook.is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); + delete this; + return 1; + } + return 0; + } -/********** - * Action * - **********/ + void NetworkConstantAction::cancel() + { + return; + } -int NetworkConstantActionLmm::unref() -{ - m_refcount--; - if (!m_refcount) { - xbt_swag_remove(static_cast(this), p_stateSet); - delete this; - return 1; } - return 0; -} - -void NetworkConstantActionLmm::cancel() -{ - return; -} - -#ifdef HAVE_TRACING -void NetworkConstantActionLmm::setCategory(const char *category) -{ - //ignore completely the categories in constant model, they are not traced -} -#endif - -void NetworkConstantActionLmm::suspend() -{ - m_suspended = true; -} - -void NetworkConstantActionLmm::resume() -{ - if (m_suspended) - m_suspended = false; } - -void NetworkConstantActionLmm::recycle() -{ - return; -} - -bool NetworkConstantActionLmm::isSuspended() -{ - return m_suspended; -} -