X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..627cef048b8d7a523fa6d2ccaec750eccb0468e9:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 2002616db7..f3e83138a0 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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. */ @@ -7,12 +6,13 @@ #include #include "network_cm02.hpp" -#include "maxmin_private.hpp" +#include "simgrid/s4u/Host.hpp" #include "simgrid/sg_config.h" +#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "src/kernel/lmm/maxmin.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); -double sg_sender_gap = 0.0; double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */ double sg_bandwidth_factor = 1.0; /* default value; can be set by model or from command line */ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or from command line */ @@ -20,21 +20,6 @@ double sg_weight_S_parameter = 0.0; /* default value; can be set by model or double sg_tcp_gamma = 0.0; int sg_network_crosstraffic = 0; -/************* - * CallBacks * - *************/ - -void net_define_callbacks(void) -{ - /* Figuring out the network links */ - sg_platf_link_add_cb(netlink_parse_init); - sg_platf_postparse_add_cb(net_add_traces); -} - -/********* - * Model * - *********/ - /************************************************************************/ /* New model based on optimizations discussed during Pedro Velho's thesis*/ /************************************************************************/ @@ -49,21 +34,17 @@ void net_define_callbacks(void) /* month = Nov, */ /* pdf = {http://hal.inria.fr/hal-00646896/PDF/rr-validity.pdf}, */ /* } */ -void surf_network_model_init_LegrandVelho(void) +void surf_network_model_init_LegrandVelho() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - - xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", - 13.01); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.97); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 20537); + all_existing_models->push_back(surf_network_model); + + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); } /***************************************************************************/ @@ -77,21 +58,18 @@ void surf_network_model_init_LegrandVelho(void) /* month = {oct}, */ /* year = {2002} */ /* } */ -void surf_network_model_init_CM02(void) +void surf_network_model_init_CM02() { if (surf_network_model) return; + xbt_cfg_setdefault_double("network/latency-factor", 1.0); + xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); + xbt_cfg_setdefault_double("network/weight-S", 0.0); + surf_network_model = new simgrid::surf::NetworkCm02Model(); - net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - - xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 1.0); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0); + all_existing_models->push_back(surf_network_model); } /***************************************************************************/ @@ -104,598 +82,414 @@ void surf_network_model_init_CM02(void) /* journal={{IEEE/ACM} Transactions on Networking}, */ /* volume={11}, number={4}, */ /* } */ -void surf_network_model_init_Reno(void) +void surf_network_model_init_Reno() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, - func_reno_fpi); - surf_network_model->f_networkSolve = lagrange_solve; - - xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); + set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp, + simgrid::kernel::lmm::func_reno_fpi); + + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + all_existing_models->push_back(surf_network_model); } -void surf_network_model_init_Reno2(void) +void surf_network_model_init_Reno2() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, - func_reno2_fpi); - surf_network_model->f_networkSolve = lagrange_solve; - - xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", - 8775); + set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp, + simgrid::kernel::lmm::func_reno2_fpi); + + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + all_existing_models->push_back(surf_network_model); } -void surf_network_model_init_Vegas(void) +void surf_network_model_init_Vegas() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, - func_vegas_fpi); - surf_network_model->f_networkSolve = lagrange_solve; - - xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); + set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp, + simgrid::kernel::lmm::func_vegas_fpi); + + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); + + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::lagrange_solve); + all_existing_models->push_back(surf_network_model); } namespace simgrid { namespace surf { NetworkCm02Model::NetworkCm02Model() - :NetworkModel() + :NetworkModel() { - char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim"); - int select = - xbt_cfg_get_boolean(_sg_cfg_set, "network/maxmin_selective_update"); - - if (!strcmp(optim, "Full")) { - p_updateMechanism = UM_FULL; - m_selectiveUpdate = select; - } else if (!strcmp(optim, "Lazy")) { - p_updateMechanism = UM_LAZY; - m_selectiveUpdate = 1; - xbt_assert((select == 1) - || - (xbt_cfg_is_default_value - (_sg_cfg_set, "network/maxmin_selective_update")), - "Disabling selective update while using the lazy update mechanism is dumb!"); + std::string optim = xbt_cfg_get_string("network/optim"); + bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); + + if (optim == "Full") { + setUpdateMechanism(UM_FULL); + } else if (optim == "Lazy") { + select = true; + setUpdateMechanism(UM_LAZY); + xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")), + "You cannot disable selective update when using the lazy update mechanism"); } else { - xbt_die("Unsupported optimization (%s) for this model", optim); + xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str()); } - if (!p_maxminSystem) - p_maxminSystem = lmm_system_new(m_selectiveUpdate); + maxmin_system_ = new simgrid::kernel::lmm::System(select); + loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); - routing_model_create(createLink("__loopback__", - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL)); - - if (p_updateMechanism == UM_LAZY) { - p_actionHeap = xbt_heap_new(8, NULL); - xbt_heap_set_update_callback(p_actionHeap, surf_action_lmm_update_index_heap); - p_modifiedSet = new ActionLmmList(); - p_maxminSystem->keep_track = p_modifiedSet; - } + if (getUpdateMechanism() == UM_LAZY) + maxmin_system_->modified_set_ = new kernel::resource::Action::ModifiedSet(); +} - m_haveGap = false; +NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(kernel::lmm::System* self)) : NetworkCm02Model() +{ + maxmin_system_->solve_fun = specificSolveFun; } -Link* NetworkCm02Model::createLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) +LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { - xbt_assert(NULL == Link::byName(name), - "Link '%s' declared several times in the platform", - name); - - Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history, - state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); - surf_callback_emit(networkLinkCreatedCallbacks, link); - return link; + return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxmin_system_); } void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) { - NetworkCm02Action *action; - while ((xbt_heap_size(p_actionHeap) > 0) - && (double_equals(xbt_heap_maxkey(p_actionHeap), now, sg_surf_precision))) { - action = static_cast (xbt_heap_pop(p_actionHeap)); + while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) { + + NetworkCm02Action* action = static_cast(actionHeapPop()); XBT_DEBUG("Something happened to action %p", action); if (TRACE_is_enabled()) { - int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->getVariable()); - int i; - for (i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, - action->getVariable(), - i); - NetworkCm02Link *link = static_cast(lmm_constraint_id(constraint)); - TRACE_surf_link_set_utilization(link->getName(), - action->getCategory(), - (lmm_variable_getvalue(action->getVariable())* - lmm_get_cnst_weight_from_var(p_maxminSystem, - action->getVariable(), - i)), - action->getLastUpdate(), - now - action->getLastUpdate()); + int n = action->get_variable()->get_number_of_constraint(); + + for (int i = 0; i < n; i++){ + kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i); + NetworkCm02Link* link = static_cast(constraint->get_id()); + double value = action->get_variable()->get_value() * action->get_variable()->get_constraint_weight(i); + TRACE_surf_link_set_utilization(link->getCname(), action->get_category(), value, action->get_last_update(), + now - action->get_last_update()); } } // if I am wearing a latency hat - if (action->getHat() == LATENCY) { + if (action->get_type() == kernel::resource::Action::Type::LATENCY) { XBT_DEBUG("Latency paid for action %p. Activating", action); - lmm_update_variable_weight(p_maxminSystem, action->getVariable(), action->m_weight); - action->heapRemove(p_actionHeap); - action->refreshLastUpdate(); - - // if I am wearing a max_duration or normal hat - } else if (action->getHat() == MAX_DURATION || - action->getHat() == NORMAL) { - // no need to communicate anymore - // assume that flows that reached max_duration have remaining of 0 + maxmin_system_->update_variable_weight(action->get_variable(), action->weight_); + action->heapRemove(getActionHeap()); + action->set_last_update(); + + // if I am wearing a max_duration or normal hat + } else if (action->get_type() == kernel::resource::Action::Type::MAX_DURATION || + action->get_type() == kernel::resource::Action::Type::NORMAL) { + // no need to communicate anymore + // assume that flows that reached max_duration have remaining of 0 XBT_DEBUG("Action %p finished", action); - action->setRemains(0); - action->finish(); - action->setState(SURF_ACTION_DONE); - action->heapRemove(p_actionHeap); - - action->gapRemove(); + action->finish(kernel::resource::Action::State::done); + action->heapRemove(getActionHeap()); } } - return; } void NetworkCm02Model::updateActionsStateFull(double now, double delta) { - NetworkCm02Action *action; - ActionList *running_actions = getRunningActionSet(); - - for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end()) - ; it != itend ; it=itNext) { - ++itNext; - - action = static_cast (&*it); - XBT_DEBUG("Something happened to action %p", action); - double deltap = delta; - if (action->m_latency > 0) { - if (action->m_latency > deltap) { - double_update(&(action->m_latency), deltap, sg_surf_precision); - deltap = 0.0; - } else { - double_update(&(deltap), action->m_latency, sg_surf_precision); - action->m_latency = 0.0; - } - if (action->m_latency == 0.0 && !(action->isSuspended())) - lmm_update_variable_weight(p_maxminSystem, action->getVariable(), - action->m_weight); - } - if (TRACE_is_enabled()) { - int n = lmm_get_number_of_cnst_from_var(p_maxminSystem, action->getVariable()); - int i; - for (i = 0; i < n; i++){ - lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, - action->getVariable(), - i); - NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); - TRACE_surf_link_set_utilization(link->getName(), - action->getCategory(), - (lmm_variable_getvalue(action->getVariable())* - lmm_get_cnst_weight_from_var(p_maxminSystem, - action->getVariable(), - i)), - action->getLastUpdate(), - now - action->getLastUpdate()); - } + for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + NetworkCm02Action& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it + XBT_DEBUG("Something happened to action %p", &action); + double deltap = delta; + if (action.latency_ > 0) { + if (action.latency_ > deltap) { + double_update(&action.latency_, deltap, sg_surf_precision); + deltap = 0.0; + } else { + double_update(&deltap, action.latency_, sg_surf_precision); + action.latency_ = 0.0; } - if (!lmm_get_number_of_cnst_from_var - (p_maxminSystem, action->getVariable())) { - /* There is actually no link used, hence an infinite bandwidth. - * This happens often when using models like vivaldi. - * In such case, just make sure that the action completes immediately. - */ - action->updateRemains(action->getRemains()); + if (action.latency_ <= 0.0 && not action.is_suspended()) + maxmin_system_->update_variable_weight(action.get_variable(), action.weight_); + } + if (TRACE_is_enabled()) { + int n = action.get_variable()->get_number_of_constraint(); + for (int i = 0; i < n; i++) { + kernel::lmm::Constraint* constraint = action.get_variable()->get_constraint(i); + NetworkCm02Link* link = static_cast(constraint->get_id()); + TRACE_surf_link_set_utilization( + link->getCname(), action.get_category(), + (action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i)), + action.get_last_update(), now - action.get_last_update()); } - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); - - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); - - if ((action->getRemains() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); - action->gapRemove(); - } else if (((action->getMaxDuration() != NO_MAX_DURATION) - && (action->getMaxDuration() <= 0))) { - action->finish(); - action->setState(SURF_ACTION_DONE); - action->gapRemove(); + } + if (not action.get_variable()->get_number_of_constraint()) { + /* There is actually no link used, hence an infinite bandwidth. This happens often when using models like + * vivaldi. In such case, just make sure that the action completes immediately. + */ + action.update_remains(action.get_remains()); + } + action.update_remains(action.get_variable()->get_value() * delta); + + if (action.get_max_duration() > NO_MAX_DURATION) + action.update_max_duration(delta); + + if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(kernel::resource::Action::State::done); } } - return; } -Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst, - double size, double rate) +kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - unsigned int i; - void *_link; - NetworkCm02Link *link; int failed = 0; - NetworkCm02Action *action = NULL; - double bandwidth_bound; double latency = 0.0; - xbt_dynar_t back_route = NULL; - int constraints_per_variable = 0; - - xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdge*), NULL); + std::vector back_route; + std::vector route; - XBT_IN("(%s,%s,%g,%g)", src->getName(), dst->getName(), size, rate); + XBT_IN("(%s,%s,%g,%g)", src->getCname(), dst->getCname(), size, rate); - routing_platf->getRouteAndLatency(src, dst, &route, &latency); - xbt_assert(!xbt_dynar_is_empty(route) || latency, - "You're trying to send data from %s to %s but there is no connection at all between these two hosts.", - src->getName(), dst->getName()); + src->routeTo(dst, route, &latency); + xbt_assert(not route.empty() || latency, + "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", + src->getCname(), dst->getCname()); - xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); - if (link->getState() == SURF_RESOURCE_OFF) { + for (auto const& link : route) + if (link->isOff()) failed = 1; - break; - } - } + if (sg_network_crosstraffic == 1) { - routing_platf->getRouteAndLatency(dst, src, &back_route, NULL); - xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); - if (link->getState() == SURF_RESOURCE_OFF) { + dst->routeTo(src, back_route, nullptr); + for (auto const& link : back_route) + if (link->isOff()) failed = 1; - break; - } - } } - action = new NetworkCm02Action(this, size, failed); - -#ifdef HAVE_LATENCY_BOUND_TRACKING - action->m_latencyLimited = 0; -#endif - action->m_weight = action->m_latency = latency; - - action->m_rate = rate; - if (p_updateMechanism == UM_LAZY) { - action->m_indexHeap = -1; - action->m_lastUpdate = surf_get_clock(); + NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); + action->weight_ = latency; + action->latency_ = latency; + action->rate_ = rate; + if (getUpdateMechanism() == UM_LAZY) { + action->set_last_update(); } - bandwidth_bound = -1.0; - if (sg_weight_S_parameter > 0) { - xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); - action->m_weight += sg_weight_S_parameter / link->getBandwidth(); - } - } - xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); - double bb = bandwidthFactor(size) * link->getBandwidth(); - bandwidth_bound = - (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); - } + double bandwidth_bound = -1.0; + if (sg_weight_S_parameter > 0) + for (auto const& link : route) + action->weight_ += sg_weight_S_parameter / link->bandwidth(); - action->m_latCurrent = action->m_latency; - action->m_latency *= latencyFactor(size); - action->m_rate = bandwidthConstraint(action->m_rate, bandwidth_bound, size); - if (m_haveGap) { - xbt_assert(!xbt_dynar_is_empty(route), - "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); - - link = *static_cast(xbt_dynar_get_ptr(route, 0)); - gapAppend(size, link, action); - XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", - action, src->getName(), dst->getName(), action->m_senderGap, - action->m_latency); + for (auto const& link : route) { + double bb = bandwidthFactor(size) * link->bandwidth(); + bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } - constraints_per_variable = xbt_dynar_length(route); - if (back_route != NULL) - constraints_per_variable += xbt_dynar_length(back_route); + action->latCurrent_ = action->latency_; + action->latency_ *= latencyFactor(size); + action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); + + int constraints_per_variable = route.size(); + constraints_per_variable += back_route.size(); - if (action->m_latency > 0) { - action->p_variable = lmm_variable_new(p_maxminSystem, action, 0.0, -1.0, - constraints_per_variable); - if (p_updateMechanism == UM_LAZY) { + if (action->latency_ > 0) { + action->set_variable(maxmin_system_->variable_new(action, 0.0, -1.0, constraints_per_variable)); + if (getUpdateMechanism() == UM_LAZY) { // add to the heap the event when the latency is payed - XBT_DEBUG("Added action (%p) one latency event at date %f", action, - action->m_latency + action->m_lastUpdate); - action->heapInsert(p_actionHeap, action->m_latency + action->m_lastUpdate, xbt_dynar_is_empty(route) ? NORMAL : LATENCY); + XBT_DEBUG("Added action (%p) one latency event at date %f", action, action->latency_ + action->get_last_update()); + action->heapInsert(getActionHeap(), action->latency_ + action->get_last_update(), + route.empty() ? kernel::resource::Action::Type::NORMAL + : kernel::resource::Action::Type::LATENCY); } } else - action->p_variable = lmm_variable_new(p_maxminSystem, action, 1.0, -1.0, constraints_per_variable); + action->set_variable(maxmin_system_->variable_new(action, 1.0, -1.0, constraints_per_variable)); - if (action->m_rate < 0) { - lmm_update_variable_bound(p_maxminSystem, action->getVariable(), (action->m_latCurrent > 0) ? sg_tcp_gamma / (2.0 * action->m_latCurrent) : -1.0); + if (action->rate_ < 0) { + maxmin_system_->update_variable_bound( + action->get_variable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0); } else { - lmm_update_variable_bound(p_maxminSystem, action->getVariable(), (action->m_latCurrent > 0) ? std::min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent)) : action->m_rate); + maxmin_system_->update_variable_bound(action->get_variable(), + (action->latCurrent_ > 0) + ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) + : action->rate_); } - xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); - lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), 1.0); - } + for (auto const& link : route) + maxmin_system_->expand(link->constraint(), action->get_variable(), 1.0); - if (sg_network_crosstraffic == 1) { - XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); - xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); - lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), .05); - } - } + if (not back_route.empty()) { // sg_network_crosstraffic was activated + XBT_DEBUG("Crosstraffic active adding backward flow using 5%%"); + for (auto const& link : back_route) + maxmin_system_->expand(link->constraint(), action->get_variable(), .05); - xbt_dynar_free(&route); + // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency + // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency()) + // action->getVariable()->set_concurrency_share(2) + } XBT_OUT(); - surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate); + simgrid::s4u::Link::onCommunicate(action, src, dst); return action; } -void NetworkCm02Model::addTraces(){ - xbt_dict_cursor_t cursor = NULL; - char *trace_name, *elm; - - static int called = 0; - if (called) - return; - called = 1; - - /* connect all traces relative to network */ - xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02Link *link = static_cast( Link::byName(elm) ); - - xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); - xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); - - link->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); - } - - xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02Link *link = static_cast( Link::byName(elm) ); - - xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); - xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); - - link->p_speed.event = tmgr_history_add_trace(history, trace, 0.0, 0, link); - } - - xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02Link *link = static_cast(Link::byName(elm));; - - xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", - trace_name, elm); - xbt_assert(trace, - "Cannot connect trace %s to link %s: trace undefined", - trace_name, elm); - - link->p_latEvent = tmgr_history_add_trace(history, trace, 0.0, 0, link); - } -} - /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, - lmm_system_t system, - double constraint_value, - tmgr_history_t history, - e_surf_resource_state_t state_init, - tmgr_trace_t state_trace, - double metric_peak, - tmgr_trace_t metric_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_link_sharing_policy_t policy) -: Link(model, name, props, lmm_constraint_new(system, this, constraint_value), history, state_trace) +NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy, kernel::lmm::System* system) + : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth)) { - setState(state_init); + bandwidth_.scale = 1.0; + bandwidth_.peak = bandwidth; - p_speed.scale = 1.0; - p_speed.peak = metric_peak; - if (metric_trace) - p_speed.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, this); - else - p_speed.event = NULL; - - m_latCurrent = lat_initial; - if (lat_trace) - p_latEvent = tmgr_history_add_trace(history, lat_trace, 0.0, 0, this); + latency_.scale = 1.0; + latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + constraint()->unshare(); + + simgrid::s4u::Link::onCreation(this->piface_); } +void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value) +{ + /* Find out which of my iterators was triggered, and react accordingly */ + if (triggered == bandwidth_.event) { + setBandwidth(value); + tmgr_trace_event_unref(&bandwidth_.event); + } else if (triggered == latency_.event) { + setLatency(value); + tmgr_trace_event_unref(&latency_.event); -void NetworkCm02Link::updateState(tmgr_trace_event_t event_type, - double value, double date) -{ - /* printf("[" "%g" "] Asking to update network card \"%s\" with value " */ - /* "%g" " for event %p\n", surf_get_clock(), nw_link->name, */ - /* value, event_type); */ - - if (event_type == p_speed.event) { - updateBandwidth(value, date); - if (tmgr_trace_event_free(event_type)) - p_speed.event = NULL; - } else if (event_type == p_latEvent) { - updateLatency(value, date); - if (tmgr_trace_event_free(event_type)) - p_latEvent = NULL; - } else if (event_type == p_stateEvent) { + } else if (triggered == stateEvent_) { if (value > 0) - setState(SURF_RESOURCE_ON); + turnOn(); else { - lmm_constraint_t cnst = getConstraint(); - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - - setState(SURF_RESOURCE_OFF); - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) { - Action *action = static_cast( lmm_variable_id(var) ); - - if (action->getState() == SURF_ACTION_RUNNING || - action->getState() == SURF_ACTION_READY) { - action->setFinishTime(date); - action->setState(SURF_ACTION_FAILED); + kernel::lmm::Variable* var = nullptr; + const_lmm_element_t elem = nullptr; + double now = surf_get_clock(); + + turnOff(); + while ((var = constraint()->get_variable(&elem))) { + kernel::resource::Action* action = static_cast(var->get_id()); + + if (action->get_state() == kernel::resource::Action::State::running || + action->get_state() == kernel::resource::Action::State::ready) { + action->set_finish_time(now); + action->set_state(kernel::resource::Action::State::failed); } } } - if (tmgr_trace_event_free(event_type)) - p_stateEvent = NULL; + tmgr_trace_event_unref(&stateEvent_); } else { - XBT_CRITICAL("Unknown event ! \n"); - xbt_abort(); + xbt_die("Unknown event!\n"); } - XBT_DEBUG - ("There were a resource state event, need to update actions related to the constraint (%p)", - getConstraint()); - return; + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", constraint()); } -void NetworkCm02Link::updateBandwidth(double value, double date){ - double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / - (p_speed.peak * p_speed.scale); - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - lmm_element_t nextelem = NULL; - int numelem = 0; - - NetworkCm02Action *action = NULL; - - p_speed.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), - getConstraint(), - sg_bandwidth_factor * - (p_speed.peak * p_speed.scale)); - TRACE_surf_link_set_bandwidth(date, getName(), sg_bandwidth_factor * p_speed.peak * p_speed.scale); +void NetworkCm02Link::setBandwidth(double value) +{ + bandwidth_.peak = value; + + model()->getMaxminSystem()->update_constraint_bound(constraint(), + sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + TRACE_surf_link_set_bandwidth(surf_get_clock(), getCname(), sg_bandwidth_factor * bandwidth_.peak * bandwidth_.scale); + if (sg_weight_S_parameter > 0) { - while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { - action = (NetworkCm02Action*) lmm_variable_id(var); - action->m_weight += delta; - if (!action->isSuspended()) - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->m_weight); + double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); + + kernel::lmm::Variable* var; + const_lmm_element_t elem = nullptr; + const_lmm_element_t nextelem = nullptr; + int numelem = 0; + while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + NetworkCm02Action* action = static_cast(var->get_id()); + action->weight_ += delta; + if (not action->is_suspended()) + model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); } } } -void NetworkCm02Link::updateLatency(double value, double date){ - double delta = value - m_latCurrent; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - lmm_element_t nextelem = NULL; - int numelem = 0; - NetworkCm02Action *action = NULL; - - m_latCurrent = value; - while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { - action = (NetworkCm02Action*) lmm_variable_id(var); - action->m_latCurrent += delta; - action->m_weight += delta; - if (action->m_rate < 0) - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), sg_tcp_gamma / (2.0 * action->m_latCurrent)); +void NetworkCm02Link::setLatency(double value) +{ + double delta = value - latency_.peak; + kernel::lmm::Variable* var = nullptr; + const_lmm_element_t elem = nullptr; + const_lmm_element_t nextelem = nullptr; + int numelem = 0; + + latency_.peak = value; + + while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) { + NetworkCm02Action* action = static_cast(var->get_id()); + action->latCurrent_ += delta; + action->weight_ += delta; + if (action->rate_ < 0) + model()->getMaxminSystem()->update_variable_bound(action->get_variable(), + sg_tcp_gamma / (2.0 * action->latCurrent_)); else { - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), - std::min(action->m_rate, sg_tcp_gamma / (2.0 * action->m_latCurrent))); + model()->getMaxminSystem()->update_variable_bound( + action->get_variable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))); - if (action->m_rate < sg_tcp_gamma / (2.0 * action->m_latCurrent)) { + if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) { XBT_INFO("Flow is limited BYBANDWIDTH"); } else { - XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", - action->m_latCurrent); + XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->latCurrent_); } } - if (!action->isSuspended()) - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->m_weight); + if (not action->is_suspended()) + model()->getMaxminSystem()->update_variable_weight(action->get_variable(), action->weight_); } } /********** * Action * **********/ -void NetworkCm02Action::updateRemainingLazy(double now) -{ - double delta = 0.0; - if (m_suspended != 0) +void NetworkCm02Action::update_remains_lazy(double now) +{ + if (suspended_ != Action::SuspendStates::not_suspended) return; - delta = now - m_lastUpdate; + double delta = now - get_last_update(); + double max_duration = get_max_duration(); - if (m_remains > 0) { - XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate); - double_update(&(m_remains), m_lastValue * delta, sg_maxmin_precision*sg_surf_precision); + if (get_remains_no_update() > 0) { + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(), + get_last_update()); + update_remains(get_last_value() * delta); - XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); + XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update()); } - if (m_maxDuration != NO_MAX_DURATION) - double_update(&m_maxDuration, delta, sg_surf_precision); - - if (m_remains <= 0 && - (lmm_get_variable_weight(getVariable()) > 0)) { - finish(); - setState(SURF_ACTION_DONE); + if (max_duration > NO_MAX_DURATION) { + double_update(&max_duration, delta, sg_surf_precision); + set_max_duration(max_duration); + } - heapRemove(getModel()->getActionHeap()); - } else if (((m_maxDuration != NO_MAX_DURATION) - && (m_maxDuration <= 0))) { - finish(); - setState(SURF_ACTION_DONE); - heapRemove(getModel()->getActionHeap()); + if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) || + ((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) { + finish(Action::State::done); + heapRemove(get_model()->getActionHeap()); } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + set_last_update(); + set_last_value(get_variable()->get_value()); } }