X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25f00868d318a0c49b4965ea9dea9a78bc349365..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index a178748083..bb735decf8 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -9,6 +9,7 @@ #include "network_cm02.hpp" #include "maxmin_private.hpp" #include "simgrid/sg_config.h" +#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network); @@ -20,20 +21,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 */ - simgrid::surf::on_link.connect(netlink_parse_init); -} - -/********* - * Model * - *********/ - /************************************************************************/ /* New model based on optimizations discussed during Pedro Velho's thesis*/ /************************************************************************/ @@ -54,15 +41,11 @@ void surf_network_model_init_LegrandVelho(void) 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); + xbt_dynar_push(all_existing_models, &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); } /***************************************************************************/ @@ -84,11 +67,10 @@ void surf_network_model_init_CM02(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - net_define_callbacks(); - 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); + 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); } /***************************************************************************/ @@ -108,13 +90,13 @@ void surf_network_model_init_Reno(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - net_define_callbacks(); + 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); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } @@ -125,13 +107,13 @@ void surf_network_model_init_Reno2(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - net_define_callbacks(); + 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); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } void surf_network_model_init_Vegas(void) @@ -141,13 +123,13 @@ void surf_network_model_init_Vegas(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - net_define_callbacks(); + 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); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } namespace simgrid { @@ -156,76 +138,59 @@ namespace surf { NetworkCm02Model::NetworkCm02Model() :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"); + char *optim = xbt_cfg_get_string("network/optim"); + int select = xbt_cfg_get_boolean("network/maxmin-selective-update"); if (!strcmp(optim, "Full")) { - p_updateMechanism = UM_FULL; - m_selectiveUpdate = select; + updateMechanism_ = UM_FULL; + 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")), + updateMechanism_ = UM_LAZY; + selectiveUpdate_ = 1; + xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")), "Disabling selective update while using the lazy update mechanism is dumb!"); } else { xbt_die("Unsupported optimization (%s) for this model", optim); } - if (!p_maxminSystem) - p_maxminSystem = lmm_system_new(m_selectiveUpdate); + if (!maxminSystem_) + maxminSystem_ = lmm_system_new(selectiveUpdate_); - routing_model_create(createLink("__loopback__", - 498000000, NULL, 0.000015, NULL, - 1 /*SURF_RESOURCE_ON*/, NULL, - SURF_LINK_FATPIPE, NULL)); + routing_model_create(createLink("__loopback__", 498000000, 0.000015, 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 (updateMechanism_ == UM_LAZY) { + actionHeap_ = xbt_heap_new(8, NULL); + xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); + modifiedSet_ = new ActionLmmList(); + maxminSystem_->keep_track = modifiedSet_; } } -Link* NetworkCm02Model::createLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - int initiallyOn, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) +NetworkCm02Model::~NetworkCm02Model() {} + +Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, + xbt_dict_t properties) { - 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, - initiallyOn, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); - Link::onCreation(link); - return link; + return new NetworkCm02Link(this, name, properties, bandwidth, latency, policy, maxminSystem_); } 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 ((xbt_heap_size(actionHeap_) > 0) + && (double_equals(xbt_heap_maxkey(actionHeap_), now, sg_surf_precision))) { + action = static_cast (xbt_heap_pop(actionHeap_)); 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); + int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); + + for (int i = 0; i < n; i++){ + lmm_constraint_t constraint = lmm_get_cnst_from_var(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, + lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i)), action->getLastUpdate(), @@ -236,8 +201,8 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) // if I am wearing a latency hat if (action->getHat() == 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); + lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_); + action->heapRemove(actionHeap_); action->refreshLastUpdate(); // if I am wearing a max_duration or normal hat @@ -248,8 +213,8 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) XBT_DEBUG("Action %p finished", action); action->setRemains(0); action->finish(); - action->setState(SURF_ACTION_DONE); - action->heapRemove(p_actionHeap); + action->setState(Action::State::done); + action->heapRemove(actionHeap_); action->gapRemove(); } @@ -270,38 +235,35 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) 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); + if (action->latency_ > 0) { + if (action->latency_ > deltap) { + double_update(&(action->latency_), deltap, sg_surf_precision); deltap = 0.0; } else { - double_update(&(deltap), action->m_latency, sg_surf_precision); - action->m_latency = 0.0; + double_update(&(deltap), action->latency_, sg_surf_precision); + action->latency_ = 0.0; } - if (action->m_latency == 0.0 && !(action->isSuspended())) - lmm_update_variable_weight(p_maxminSystem, action->getVariable(), - action->m_weight); + if (action->latency_ == 0.0 && !(action->isSuspended())) + lmm_update_variable_weight(maxminSystem_, action->getVariable(), + action->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); + int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable()); + for (int i = 0; i < n; i++){ + lmm_constraint_t constraint = lmm_get_cnst_from_var(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, + lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i)), action->getLastUpdate(), now - action->getLastUpdate()); } } - if (!lmm_get_number_of_cnst_from_var - (p_maxminSystem, action->getVariable())) { + if (!lmm_get_number_of_cnst_from_var (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. @@ -316,173 +278,145 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) if ((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); action->gapRemove(); } else if (((action->getMaxDuration() != NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) { action->finish(); - action->setState(SURF_ACTION_DONE); + action->setState(Action::State::done); action->gapRemove(); } } - return; } -Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, - double size, double rate) +Action *NetworkCm02Model::communicate(NetCard *src, NetCard *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; + std::vector * back_route = NULL; int constraints_per_variable = 0; - xbt_dynar_t route = xbt_dynar_new(sizeof(NetCard*), NULL); + std::vector *route = new std::vector(); XBT_IN("(%s,%s,%g,%g)", src->name(), dst->name(), size, rate); - routing_platf->getRouteAndLatency(src, dst, &route, &latency); - xbt_assert(!xbt_dynar_is_empty(route) || latency, + routing_platf->getRouteAndLatency(src, dst, route, &latency); + xbt_assert(! route->empty() || latency, "You're trying to send data from %s to %s but there is no connecting path between these two hosts.", src->name(), dst->name()); - xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); - if (link->isOff()) { + for (auto 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->isOff()) { + back_route = new std::vector(); + routing_platf->getRouteAndLatency(dst, src, back_route, NULL); + for (auto 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; + NetworkCm02Action *action = new NetworkCm02Action(this, size, failed); + action->weight_ = action->latency_ = latency; - action->m_rate = rate; - if (p_updateMechanism == UM_LAZY) { - action->m_indexHeap = -1; - action->m_lastUpdate = surf_get_clock(); + action->rate_ = rate; + if (updateMechanism_ == UM_LAZY) { + action->indexHeap_ = -1; + action->lastUpdate_ = surf_get_clock(); } 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); + if (sg_weight_S_parameter > 0) + for (auto link : *route) + action->weight_ += sg_weight_S_parameter / link->getBandwidth(); + + for (auto link : *route) { double bb = bandwidthFactor(size) * link->getBandwidth(); - bandwidth_bound = - (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); + bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } - 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), + action->latCurrent_ = action->latency_; + action->latency_ *= latencyFactor(size); + action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size); + if (haveGap_) { + xbt_assert(! route->empty(), "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->name(), dst->name(), action->m_senderGap, - action->m_latency); + gapAppend(size, route->at(0), action); + XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->name(), dst->name(), action->senderGap_, action->latency_); } - constraints_per_variable = xbt_dynar_length(route); + constraints_per_variable = route->size(); if (back_route != NULL) - constraints_per_variable += xbt_dynar_length(back_route); + 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->variable_ = lmm_variable_new(maxminSystem_, action, 0.0, -1.0, constraints_per_variable); + if (updateMechanism_ == 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->lastUpdate_); + action->heapInsert(actionHeap_, action->latency_ + action->lastUpdate_, route->empty() ? NORMAL : LATENCY); } } else - action->p_variable = lmm_variable_new(p_maxminSystem, action, 1.0, -1.0, constraints_per_variable); + action->variable_ = lmm_variable_new(maxminSystem_, 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) { + lmm_update_variable_bound(maxminSystem_, action->getVariable(), (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); + lmm_update_variable_bound(maxminSystem_, action->getVariable(), (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 link: *route) + lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), 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); - } - lmm_variable_concurrency_share_set(action->getVariable(),2); + for (auto link : *back_route) + lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), .05); + + //Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency + //(You would also have to change lmm_element_concurrency()) + //lmm_variable_concurrency_share_set(action->getVariable(),2); } - xbt_dynar_free(&route); + delete route; + delete back_route; XBT_OUT(); - networkCommunicateCallbacks(action, src, dst, size, rate); + Link::onCommunicate(action, src, dst); return action; } +bool NetworkCm02Model::next_occuring_event_isIdempotent() +{ + return true; +} + +void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action) +{ + // Nothing +}; + /************ * Resource * ************/ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, - lmm_system_t system, - double constraint_value, - int initiallyOn, tmgr_trace_t state_trace, - double bw_peak, tmgr_trace_t bw_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), state_trace) + double bandwidth, double latency, e_surf_link_sharing_policy_t policy, + lmm_system_t system) +: Link(model, name, props, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) { - if (initiallyOn) - turnOn(); - else - turnOff(); - m_bandwidth.scale = 1.0; - m_bandwidth.peak = bw_peak; - if (bw_trace) - m_bandwidth.event = future_evt_set->add_trace(bw_trace, 0.0, this); - else - m_bandwidth.event = NULL; + m_bandwidth.peak = bandwidth; m_latency.scale = 1.0; - m_latency.peak = lat_initial; - if (lat_trace) - m_latency.event = future_evt_set->add_trace(lat_trace, 0.0, this); + m_latency.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + lmm_constraint_shared(getConstraint()); + + Link::onCreation(this); } @@ -511,10 +445,10 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { Action *action = static_cast( lmm_variable_id(var) ); - if (action->getState() == SURF_ACTION_RUNNING || - action->getState() == SURF_ACTION_READY) { + if (action->getState() == Action::State::running || + action->getState() == Action::State::ready) { action->setFinishTime(now); - action->setState(SURF_ACTION_FAILED); + action->setState(Action::State::failed); } } } @@ -523,33 +457,29 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) xbt_die("Unknown event!\n"); } - XBT_DEBUG - ("There was a resource state event, need to update actions related to the constraint (%p)", + XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", getConstraint()); } void NetworkCm02Link::updateBandwidth(double value) { - double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / - (m_bandwidth.peak * m_bandwidth.scale); - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - lmm_element_t nextelem = NULL; - int numelem = 0; - - NetworkCm02Action *action = NULL; m_bandwidth.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), - getConstraint(), - sg_bandwidth_factor * - (m_bandwidth.peak * m_bandwidth.scale)); + + lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), + sg_bandwidth_factor * (m_bandwidth.peak * m_bandwidth.scale)); TRACE_surf_link_set_bandwidth(surf_get_clock(), getName(), sg_bandwidth_factor * m_bandwidth.peak * m_bandwidth.scale); + if (sg_weight_S_parameter > 0) { + double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (m_bandwidth.peak * m_bandwidth.scale); + + lmm_variable_t var; + lmm_element_t elem = NULL, nextelem = NULL; + int numelem = 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; + NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); + action->weight_ += delta; if (!action->isSuspended()) - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->m_weight); + lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_); } } } @@ -560,69 +490,78 @@ void NetworkCm02Link::updateLatency(double value){ lmm_element_t elem = NULL; lmm_element_t nextelem = NULL; int numelem = 0; - NetworkCm02Action *action = NULL; m_latency.peak = 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)); + NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); + action->latCurrent_ += delta; + action->weight_ += delta; + if (action->rate_ < 0) + lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), 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))); + 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); + lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_); } } +NetworkCm02Link::~NetworkCm02Link() {} + /********** * Action * **********/ + +NetworkCm02Action::~NetworkCm02Action() {} + void NetworkCm02Action::updateRemainingLazy(double now) { double delta = 0.0; - if (m_suspended != 0) + if (suspended_ != 0) return; - delta = now - m_lastUpdate; + delta = now - lastUpdate_; - 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 (remains_ > 0) { + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_); + double_update(&(remains_), lastValue_ * delta, sg_maxmin_precision*sg_surf_precision); - XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); + XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_); } - if (m_maxDuration != NO_MAX_DURATION) - double_update(&m_maxDuration, delta, sg_surf_precision); + if (maxDuration_ != NO_MAX_DURATION) + double_update(&maxDuration_, delta, sg_surf_precision); - if (m_remains <= 0 && + if (remains_ <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) { finish(); - setState(SURF_ACTION_DONE); + setState(Action::State::done); heapRemove(getModel()->getActionHeap()); - } else if (((m_maxDuration != NO_MAX_DURATION) - && (m_maxDuration <= 0))) { + } else if (((maxDuration_ != NO_MAX_DURATION) + && (maxDuration_ <= 0))) { finish(); - setState(SURF_ACTION_DONE); + setState(Action::State::done); heapRemove(getModel()->getActionHeap()); } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + lastUpdate_ = now; + lastValue_ = lmm_variable_getvalue(getVariable()); } +void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action) +{ + // Nothing +}; + } }