#include <algorithm>
-#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
:NetworkModel()
{
char *optim = xbt_cfg_get_string("network/optim");
- int select = xbt_cfg_get_boolean("network/maxmin-selective-update");
+ 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("network/maxmin-selective-update")),
- "You cannot disable selective update while using the lazy update mechanism!");
+ 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. 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);
NetworkCm02Model::~NetworkCm02Model() {}
-Link* NetworkCm02Model::createLink(const char *name, double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
- xbt_dict_t properties)
+LinkImpl* 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*/)
NetworkCm02Link *link = static_cast<NetworkCm02Link*>(lmm_constraint_id(constraint));
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());
+ TRACE_surf_link_set_utilization(link->cname(), action->getCategory(), value, action->getLastUpdate(),
+ now - action->getLastUpdate());
}
}
action->gapRemove();
}
}
- return;
}
lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
NetworkCm02Link* link = static_cast<NetworkCm02Link*>(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());
+ TRACE_surf_link_set_utilization(link->cname(), action->getCategory(),
+ (lmm_variable_getvalue(action->getVariable()) *
+ lmm_get_cnst_weight_from_var(maxminSystem_, action->getVariable(), i)),
+ action->getLastUpdate(), now - action->getLastUpdate());
}
}
if (!lmm_get_number_of_cnst_from_var (maxminSystem_, action->getVariable())) {
}
}
-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;
double latency = 0.0;
- std::vector<Link*> * back_route = nullptr;
+ std::vector<LinkImpl*>* back_route = nullptr;
int constraints_per_variable = 0;
- std::vector<Link*> *route = new std::vector<Link*>();
+ std::vector<LinkImpl*>* route = new std::vector<LinkImpl*>();
- 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())
failed = 1;
if (sg_network_crosstraffic == 1) {
- back_route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency(dst, src, back_route, nullptr);
+ back_route = new std::vector<LinkImpl*>();
+ dst->routeTo(src, back_route, nullptr);
for (auto link: *back_route)
if (link->isOff())
failed = 1;
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);
}
"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();
}
for (auto link: *route)
- lmm_expand(maxminSystem_, link->getConstraint(), action->getVariable(), 1.0);
+ lmm_expand(maxminSystem_, link->constraint(), 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);
-
+ lmm_expand(maxminSystem_, link->constraint(), 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);
delete back_route;
XBT_OUT();
- Link::onCommunicate(action, src, dst);
+ simgrid::s4u::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
+void NetworkCm02Model::gapAppend(double size, const LinkImpl* 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)
+ : LinkImpl(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());
+ lmm_constraint_shared(constraint());
- Link::onCreation(this);
+ simgrid::s4u::Link::onCreation(this->piface_);
}
-
-
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 {
double now = surf_get_clock();
turnOff();
- while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
+ while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) {
Action *action = static_cast<Action*>( lmm_variable_id(var) );
if (action->getState() == Action::State::running ||
}
}
}
- tmgr_trace_event_unref(&m_stateEvent);
+ tmgr_trace_event_unref(&stateEvent_);
} else {
xbt_die("Unknown event!\n");
}
- XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)",
- getConstraint());
+ XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", constraint());
}
-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);
+ lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(),
+ sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale));
+ TRACE_surf_link_set_bandwidth(surf_get_clock(), cname(), 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;
int numelem = 0;
- while ((var = lmm_get_var_from_cnst_safe(getModel()->getMaxminSystem(), getConstraint(), &elem, &nextelem, &numelem))) {
+ while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
NetworkCm02Action *action = (NetworkCm02Action*) lmm_variable_id(var);
action->weight_ += delta;
if (!action->isSuspended())
- lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_);
+ lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
}
}
}
-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))) {
+ while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
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_));
+ lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(),
+ sg_tcp_gamma / (2.0 * action->latCurrent_));
else {
- lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(),
+ lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(),
std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)));
if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) {
}
}
if (!action->isSuspended())
- lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), action->weight_);
+ lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
}
}
lastValue_ = lmm_variable_getvalue(getVariable());
}
-void NetworkCm02Link::gapAppend(double size, const Link* link, NetworkAction* action)
-{
- // Nothing
+void NetworkCm02Link::gapAppend(double size, const LinkImpl* link, NetworkAction* action){
+ // Nothing
};
-
}
}
