X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..556b75727b8870fed020d2d884b54a426be1d388:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index fc4babc90d..1f97acca37 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,171 +1,99 @@ +/* Copyright (c) 2013-2017. 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 random_data_t random_latency = NULL; -static int host_number_int = 0; - -static void netcste_count_hosts(sg_platf_host_cbarg_t h) { - host_number_int++; -} /********* * Model * *********/ void surf_network_model_init_Constant() { - xbt_assert(surf_network_model == NULL); - surf_network_model = new NetworkConstantModel(); - - if (!random_latency) - random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034); - - //FIXME:sg_platf_host_add_cb(netcste_count_hosts); + xbt_assert(surf_network_model == nullptr); + surf_network_model = new simgrid::surf::NetworkConstantModel(); + all_existing_models->push_back(surf_network_model); +} - xbt_dynar_push(model_list, &surf_network_model); +namespace simgrid { +namespace surf { +LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat, + e_surf_link_sharing_policy_t policy) +{ - //FIXME:routing_model_create(NULL); + 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.c_str()); + return nullptr; } -double NetworkConstantModel::shareResources(double now) +double NetworkConstantModel::nextOccuringEvent(double /*now*/) { - void *_action = NULL; - NetworkConstantActionLmmPtr action = NULL; double min = -1.0; - xbt_swag_foreach(_action, p_runningActionSet) { - action = (NetworkConstantActionLmmPtr) _action; - if (action->m_latency > 0) { - if (min < 0) - min = action->m_latency; - else if (action->m_latency < min) - min = action->m_latency; - } + ActionList* actionSet = getRunningActionSet(); + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itend(actionSet->end()); + for (; it != itend; ++it) { + NetworkConstantAction* action = static_cast(&*it); + if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) + min = action->latency_; } return min; } -void NetworkConstantModel::updateActionsState(double now, double delta) +void NetworkConstantModel::updateActionsState(double /*now*/, double delta) { - void *_action, *_next_action; - NetworkConstantActionLmmPtr action = NULL; - - xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) { - action = (NetworkConstantActionLmmPtr) _action; - if (action->m_latency > 0) { - if (action->m_latency > delta) { - double_update(&(action->m_latency), delta); + NetworkConstantAction* action = nullptr; + ActionList* actionSet = getRunningActionSet(); + ActionList::iterator it(actionSet->begin()); + ActionList::iterator itNext = it; + ActionList::iterator itend(actionSet->end()); + for (; 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->m_latency = 0.0; + action->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); + action->updateRemains(action->getCost() * delta / action->initialLatency_); + if (action->getMaxDuration() != NO_MAX_DURATION) + action->updateMaxDuration(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); + if ((action->getRemainsNoUpdate() <= 0) || + ((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { + action->finish(Action::State::done); } } } -NetworkCm02ActionLmmPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, - double size, double rate) +Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* 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(); + NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor); + simgrid::s4u::Link::onCommunicate(action, src, dst); return action; } -/************ - * Resource * - ************/ -bool NetworkConstantLinkLmm::isUsed() -{ - return 0; -} - -void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t event_type, - double value, double time) -{ - DIE_IMPOSSIBLE; -} - -double NetworkConstantLinkLmm::getBandwidth() -{ - DIE_IMPOSSIBLE; - return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} - -double NetworkConstantLinkLmm::getLatency() -{ - DIE_IMPOSSIBLE; - return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} - -bool NetworkConstantLinkLmm::isShared() -{ - DIE_IMPOSSIBLE; - return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */ -} - /********** * Action * **********/ - -int NetworkConstantActionLmm::unref() +NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency) + : NetworkAction(model_, size, false), initialLatency_(latency) { - m_refcount--; - if (!m_refcount) { - xbt_swag_remove(this, p_stateSet); - delete this; - return 1; + latency_ = latency; + if (latency_ <= 0.0) { + stateSet_ = model_->getDoneActionSet(); + stateSet_->push_back(*this); } - 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; +NetworkConstantAction::~NetworkConstantAction() = default; } - -void NetworkConstantActionLmm::resume() -{ - if (m_suspended) - m_suspended = false; } - -void NetworkConstantActionLmm::recycle() -{ - return; -} - -bool NetworkConstantActionLmm::isSuspended() -{ - return m_suspended; -} -