X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9919f554fd42fdb9a26defe86adbb1c3cfa59bd..c1b39b5a9e854cfc00af8b96f3b54f44cf643ca2:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 839cea3413..b84aa90184 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -6,8 +6,9 @@ #include -#include "network_cm02.hpp" #include "maxmin_private.hpp" +#include "network_cm02.hpp" +#include "simgrid/s4u/host.hpp" #include "simgrid/sg_config.h" #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals @@ -35,17 +36,17 @@ int sg_network_crosstraffic = 0; /* 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(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_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_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); } /***************************************************************************/ @@ -59,18 +60,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; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_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); + 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); } /***************************************************************************/ @@ -83,53 +84,50 @@ 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(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_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); + 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_Reno2(void) +void surf_network_model_init_Reno2() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_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); + 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) +void surf_network_model_init_Vegas() { if (surf_network_model) return; - surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + surf_network_model = new simgrid::surf::NetworkCm02Model(lagrange_solve); + all_existing_models->push_back(surf_network_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); + 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 { @@ -138,46 +136,52 @@ 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"); + bool select = xbt_cfg_get_boolean("network/maxmin-selective-update"); if (!strcmp(optim, "Full")) { updateMechanism_ = UM_FULL; selectiveUpdate_ = select; } else if (!strcmp(optim, "Lazy")) { updateMechanism_ = UM_LAZY; - 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!"); + selectiveUpdate_ = true; + 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); } - if (!maxminSystem_) - maxminSystem_ = lmm_system_new(selectiveUpdate_); - - routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, NULL)); + maxminSystem_ = lmm_system_new(selectiveUpdate_); + loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); 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_; + actionHeap_ = xbt_heap_new(8, nullptr); + xbt_heap_set_update_callback(actionHeap_, surf_action_lmm_update_index_heap); + modifiedSet_ = new ActionLmmList(); + maxminSystem_->keep_track = modifiedSet_; } } +NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) + : NetworkCm02Model() +{ + maxminSystem_->solve_fun = specificSolveFun; +} + -Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, 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) { - return new NetworkCm02Link(this, name, properties, bandwidth, latency, policy, maxminSystem_); + return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxminSystem_); } void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) { - NetworkCm02Action *action; while ((xbt_heap_size(actionHeap_) > 0) && (double_equals(xbt_heap_maxkey(actionHeap_), now, sg_surf_precision))) { - action = static_cast (xbt_heap_pop(actionHeap_)); + + NetworkCm02Action *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(maxminSystem_, action->getVariable()); @@ -185,14 +189,10 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) 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(maxminSystem_, - action->getVariable(), - i)), - action->getLastUpdate(), - now - action->getLastUpdate()); + double value = lmm_variable_getvalue(action->getVariable())* + lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i); + TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), value, + action->getLastUpdate(), now - action->getLastUpdate()); } } @@ -204,8 +204,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) action->refreshLastUpdate(); // if I am wearing a max_duration or normal hat - } else if (action->getHat() == MAX_DURATION || - action->getHat() == NORMAL) { + } 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 XBT_DEBUG("Action %p finished", action); @@ -217,20 +216,18 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) action->gapRemove(); } } - 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; + ++itNext; - action = static_cast (&*it); + NetworkCm02Action *action = static_cast (&*it); XBT_DEBUG("Something happened to action %p", action); double deltap = delta; if (action->latency_ > 0) { @@ -287,22 +284,22 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) } } -Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate) +Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { int failed = 0; double bandwidth_bound; double latency = 0.0; - std::vector * back_route = NULL; + std::vector * back_route = nullptr; int constraints_per_variable = 0; std::vector *route = new std::vector(); - XBT_IN("(%s,%s,%g,%g)", src->name(), dst->name(), size, rate); + XBT_IN("(%s,%s,%g,%g)", src->cname(), dst->cname(), size, rate); - routing_platf->getRouteAndLatency(src, dst, route, &latency); - xbt_assert(! route->empty() || latency, + src->routeTo(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()); + src->cname(), dst->cname()); for (auto link: *route) if (link->isOff()) @@ -310,7 +307,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d if (sg_network_crosstraffic == 1) { back_route = new std::vector(); - routing_platf->getRouteAndLatency(dst, src, back_route, NULL); + dst->routeTo(src, back_route, nullptr); for (auto link: *back_route) if (link->isOff()) failed = 1; @@ -328,10 +325,10 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d bandwidth_bound = -1.0; if (sg_weight_S_parameter > 0) for (auto link : *route) - action->weight_ += sg_weight_S_parameter / link->getBandwidth(); + action->weight_ += sg_weight_S_parameter / link->bandwidth(); for (auto link : *route) { - double bb = bandwidthFactor(size) * link->getBandwidth(); + double bb = bandwidthFactor(size) * link->bandwidth(); bandwidth_bound = (bandwidth_bound < 0.0) ? bb : std::min(bandwidth_bound, bb); } @@ -343,11 +340,12 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); 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_); + XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->cname(), dst->cname(), action->senderGap_, + action->latency_); } constraints_per_variable = route->size(); - if (back_route != NULL) + if (back_route != nullptr) constraints_per_variable += back_route->size(); if (action->latency_ > 0) { @@ -369,7 +367,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d for (auto link: *route) lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), 1.0); - if (sg_network_crosstraffic == 1) { + if (back_route != nullptr) { // sg_network_crosstraffic was activated XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); for (auto link : *back_route) lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), .05); @@ -380,25 +378,30 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, d } delete route; + delete back_route; XBT_OUT(); Link::onCommunicate(action, src, dst); return action; } +void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action) +{ + // Nothing +}; + /************ * Resource * ************/ -NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, - 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)) +NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy, lmm_system_t system) + : Link(model, name, lmm_constraint_new(system, this, sg_bandwidth_factor * bandwidth)) { - m_bandwidth.scale = 1.0; - m_bandwidth.peak = bandwidth; + bandwidth_.scale = 1.0; + bandwidth_.peak = bandwidth; - m_latency.scale = 1.0; - m_latency.peak = latency; + latency_.scale = 1.0; + latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(getConstraint()); @@ -412,20 +415,20 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) { /* Find out which of my iterators was triggered, and react accordingly */ - if (triggered == m_bandwidth.event) { - updateBandwidth(value); - tmgr_trace_event_unref(&m_bandwidth.event); + if (triggered == bandwidth_.event) { + setBandwidth(value); + tmgr_trace_event_unref(&bandwidth_.event); - } else if (triggered == m_latency.event) { - updateLatency(value); - tmgr_trace_event_unref(&m_latency.event); + } else if (triggered == latency_.event) { + setLatency(value); + tmgr_trace_event_unref(&latency_.event); - } else if (triggered == m_stateEvent) { + } else if (triggered == stateEvent_) { if (value > 0) turnOn(); else { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; double now = surf_get_clock(); turnOff(); @@ -439,7 +442,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) } } } - tmgr_trace_event_unref(&m_stateEvent); + tmgr_trace_event_unref(&stateEvent_); } else { xbt_die("Unknown event!\n"); } @@ -448,19 +451,20 @@ void NetworkCm02Link::apply_event(tmgr_trace_iterator_t triggered, double value) getConstraint()); } -void NetworkCm02Link::updateBandwidth(double value) { +void NetworkCm02Link::setBandwidth(double value) +{ - m_bandwidth.peak = value; + bandwidth_.peak = value; 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); + sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale)); + TRACE_surf_link_set_bandwidth(surf_get_clock(), getName(), sg_bandwidth_factor * bandwidth_.peak * 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); + double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale); lmm_variable_t var; - lmm_element_t elem = NULL, nextelem = NULL; + lmm_element_t elem = nullptr, nextelem = nullptr; int numelem = 0; while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); @@ -471,14 +475,15 @@ void NetworkCm02Link::updateBandwidth(double value) { } } -void NetworkCm02Link::updateLatency(double value){ - double delta = value - m_latency.peak; - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; - lmm_element_t nextelem = NULL; +void NetworkCm02Link::setLatency(double value) +{ + double delta = value - latency_.peak; + lmm_variable_t var = nullptr; + lmm_element_t elem = nullptr; + lmm_element_t nextelem = nullptr; int numelem = 0; - m_latency.peak = value; + latency_.peak = value; while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) { NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var); @@ -501,9 +506,14 @@ void NetworkCm02Link::updateLatency(double value){ } } +NetworkCm02Link::~NetworkCm02Link() {} + /********** * Action * **********/ + +NetworkCm02Action::~NetworkCm02Action() {} + void NetworkCm02Action::updateRemainingLazy(double now) { double delta = 0.0; @@ -540,5 +550,10 @@ void NetworkCm02Action::updateRemainingLazy(double now) lastValue_ = lmm_variable_getvalue(getVariable()); } +void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action) +{ + // Nothing +}; + } }