X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d29c09ea1d296d6a387aedf84b1c0c7084fbbea..cd4a6bff769c06de3840b08926eccf0734642f57:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 71ceece2f8..5bd7210ba1 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -1,116 +1,101 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2021. 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 "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" -#include "host_interface.hpp" -#include "src/surf/platform.hpp" - -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); /********* * Model * *********/ void surf_network_model_init_Constant() { - xbt_assert(surf_network_model == NULL); - surf_network_model = new simgrid::surf::NetworkConstantModel(); - xbt_dynar_push(all_existing_models, &surf_network_model); + auto net_model = std::make_shared("Network_Constant"); + simgrid::kernel::EngineImpl::get_instance()->add_model(net_model); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); +} - routing_model_create(NULL); +namespace simgrid { +namespace kernel { +namespace resource { - 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')"); - }); +LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector& /*bandwidth*/) +{ + 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; } -namespace simgrid { -namespace surf { +LinkImpl* NetworkConstantModel::create_wifi_link(const std::string& name, const std::vector& bandwidths) +{ + return create_link(name, bandwidths); +} -double NetworkConstantModel::shareResources(double /*now*/) +double NetworkConstantModel::next_occurring_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->m_latency > 0 && (min < 0 || action->m_latency < min)) - min = action->m_latency; + for (Action const& action : *get_started_action_set()) { + const auto& net_action = static_cast(action); + if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) + min = net_action.latency_; } - return min; } -void NetworkConstantModel::updateActionsState(double /*now*/, double delta) +void NetworkConstantModel::update_actions_state(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->m_latency > 0) { - if (action->m_latency > delta) { - double_update(&(action->m_latency), delta, sg_surf_precision); + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { + auto& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate 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; } } - action->updateRemains(action->getCost() * delta / action->m_latInit); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + action.update_remains(action.get_cost() * delta / sg_latency_factor); + action.update_max_duration(delta); - if (action->getRemainsNoUpdate() <= 0) { - action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) - && (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); + if ((action.get_remains_no_update() <= 0) || + ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(Action::State::FINISHED); } } } -Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst, - double size, double rate) +Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double /*rate*/) { - char *src_name = src->getName(); - char *dst_name = dst->getName(); + auto* action = new NetworkConstantAction(this, *src, *dst, size); - XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate); - NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor); - XBT_OUT(); - - networkCommunicateCallbacks(action, src, dst, size, rate); + s4u::Link::on_communicate(*action); return action; } /********** * Action * **********/ - -int NetworkConstantAction::unref() +NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, s4u::Host& src, s4u::Host& dst, double size) + : NetworkAction(model_, src, dst, size, false) { - m_refcount--; - if (!m_refcount) { - if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); - delete this; - return 1; - } - return 0; + latency_ = sg_latency_factor; + if (latency_ <= 0.0) + set_state(Action::State::FINISHED); } -void NetworkConstantAction::cancel() +void NetworkConstantAction::update_remains_lazy(double /*now*/) { - return; + THROW_IMPOSSIBLE; } -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid