X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb80087d529671d8e3c92150c10322d31e5cee43..30aca4d4af004d1ec899d12f0a9fe3997e9be15e:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 1721e4cb0a..75d41bc77f 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 @@ -150,10 +151,8 @@ NetworkCm02Model::NetworkCm02Model() 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, nullptr)); + maxminSystem_ = lmm_system_new(selectiveUpdate_); + loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); if (updateMechanism_ == UM_LAZY) { actionHeap_ = xbt_heap_new(8, nullptr); @@ -171,10 +170,10 @@ NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) NetworkCm02Model::~NetworkCm02Model() {} -Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy, - xbt_dict_t properties) +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*/) @@ -286,8 +285,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) } } -Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::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; @@ -297,12 +295,12 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou 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 +308,7 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou if (sg_network_crosstraffic == 1) { back_route = new std::vector(); - routing_platf->getRouteAndLatency(dst, src, back_route, nullptr); + dst->routeTo(src, back_route, nullptr); for (auto link: *back_route) if (link->isOff()) failed = 1; @@ -328,10 +326,10 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou 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,7 +341,8 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou "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(); @@ -369,7 +368,7 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou 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); @@ -387,11 +386,6 @@ Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::rou return action; } -bool NetworkCm02Model::next_occuring_event_isIdempotent() -{ - return true; -} - void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action) { // Nothing @@ -400,16 +394,15 @@ void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* a /************ * 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()); @@ -423,15 +416,15 @@ 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 { @@ -450,7 +443,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"); } @@ -459,16 +452,17 @@ 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 = nullptr, nextelem = nullptr; @@ -482,14 +476,15 @@ void NetworkCm02Link::updateBandwidth(double value) { } } -void NetworkCm02Link::updateLatency(double value){ - double delta = value - m_latency.peak; +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);