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 */
-double sg_tcp_gamma = 0.0;
int sg_network_crosstraffic = 0;
/************************************************************************/
void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
{
- while (not actionHeapIsEmpty() && double_equals(actionHeapTopDate(), now, sg_surf_precision)) {
+ while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
- NetworkCm02Action* action = static_cast<NetworkCm02Action*>(actionHeapPop());
+ NetworkCm02Action* action = static_cast<NetworkCm02Action*>(get_action_heap().pop());
XBT_DEBUG("Something happened to action %p", action);
if (TRACE_is_enabled()) {
int n = action->get_variable()->get_number_of_constraint();
kernel::lmm::Constraint* constraint = action->get_variable()->get_constraint(i);
NetworkCm02Link* link = static_cast<NetworkCm02Link*>(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(),
+ TRACE_surf_link_set_utilization(link->get_cname(), action->get_category(), value, action->get_last_update(),
now - action->get_last_update());
}
}
// if I am wearing a latency hat
- if (action->get_type() == kernel::resource::Action::Type::latency) {
+ if (action->get_type() == kernel::resource::ActionHeap::Type::latency) {
XBT_DEBUG("Latency paid for action %p. Activating", action);
get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
- action->heapRemove();
+ get_action_heap().remove(action);
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) {
+ } else if (action->get_type() == kernel::resource::ActionHeap::Type::max_duration ||
+ action->get_type() == kernel::resource::ActionHeap::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->finish(kernel::resource::Action::State::done);
- action->heapRemove();
+ get_action_heap().remove(action);
}
}
}
kernel::lmm::Constraint* constraint = action.get_variable()->get_constraint(i);
NetworkCm02Link* link = static_cast<NetworkCm02Link*>(constraint->get_id());
TRACE_surf_link_set_utilization(
- link->getCname(), action.get_category(),
+ link->get_cname(), action.get_category(),
(action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i)),
action.get_last_update(), now - action.get_last_update());
}
std::vector<LinkImpl*> back_route;
std::vector<LinkImpl*> route;
- XBT_IN("(%s,%s,%g,%g)", src->getCname(), dst->getCname(), size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
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());
+ src->get_cname(), dst->get_cname());
for (auto const& link : route)
- if (link->isOff())
+ if (link->is_off())
failed = 1;
if (sg_network_crosstraffic == 1) {
dst->routeTo(src, back_route, nullptr);
for (auto const& link : back_route)
- if (link->isOff())
+ if (link->is_off())
failed = 1;
}
action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable));
if (get_update_algorithm() == kernel::resource::Model::UpdateAlgo::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->latency_ + action->get_last_update());
- action->heapInsert(action->latency_ + action->get_last_update(), route.empty()
- ? kernel::resource::Action::Type::normal
- : kernel::resource::Action::Type::latency);
+ double date = action->latency_ + action->get_last_update();
+ kernel::resource::ActionHeap::Type type;
+ if (route.empty())
+ type = kernel::resource::ActionHeap::Type::normal;
+ else
+ type = kernel::resource::ActionHeap::Type::latency;
+
+ XBT_DEBUG("Added action (%p) one latency event at date %f", action, date);
+ get_action_heap().insert(action, date, type);
}
} else
action->set_variable(get_maxmin_system()->variable_new(action, 1.0, -1.0, constraints_per_variable));
if (action->rate_ < 0) {
get_maxmin_system()->update_variable_bound(
- action->get_variable(), (action->lat_current_ > 0) ? sg_tcp_gamma / (2.0 * action->lat_current_) : -1.0);
+ action->get_variable(), (action->lat_current_ > 0) ? cfg_tcp_gamma / (2.0 * action->lat_current_) : -1.0);
} else {
get_maxmin_system()->update_variable_bound(
action->get_variable(), (action->lat_current_ > 0)
- ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->lat_current_))
+ ? std::min(action->rate_, cfg_tcp_gamma / (2.0 * action->lat_current_))
: action->rate_);
}
for (auto const& link : route)
- get_maxmin_system()->expand(link->constraint(), action->get_variable(), 1.0);
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
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)
- get_maxmin_system()->expand(link->constraint(), action->get_variable(), .05);
+ get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
// 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())
latency_.peak = latency;
if (policy == SURF_LINK_FATPIPE)
- constraint()->unshare();
+ get_constraint()->unshare();
simgrid::s4u::Link::onCreation(this->piface_);
}
} else if (triggered == stateEvent_) {
if (value > 0)
- turnOn();
+ turn_on();
else {
kernel::lmm::Variable* var = nullptr;
- const_lmm_element_t elem = nullptr;
+ const kernel::lmm::Element* elem = nullptr;
double now = surf_get_clock();
- turnOff();
- while ((var = constraint()->get_variable(&elem))) {
+ turn_off();
+ while ((var = get_constraint()->get_variable(&elem))) {
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
if (action->get_state() == kernel::resource::Action::State::running ||
xbt_die("Unknown event!\n");
}
- XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)", constraint());
+ XBT_DEBUG("There was a resource state event, need to update actions related to the constraint (%p)",
+ get_constraint());
}
void NetworkCm02Link::setBandwidth(double value)
{
bandwidth_.peak = value;
- model()->get_maxmin_system()->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);
+ get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
+ sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale));
+ TRACE_surf_link_set_bandwidth(surf_get_clock(), get_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 / (bandwidth_.peak * bandwidth_.scale);
kernel::lmm::Variable* var;
- const_lmm_element_t elem = nullptr;
- const_lmm_element_t nextelem = nullptr;
+ const kernel::lmm::Element* elem = nullptr;
+ const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
- while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
action->weight_ += delta;
if (not action->is_suspended())
- model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
+ get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
}
}
}
{
double delta = value - latency_.peak;
kernel::lmm::Variable* var = nullptr;
- const_lmm_element_t elem = nullptr;
- const_lmm_element_t nextelem = nullptr;
+ const kernel::lmm::Element* elem = nullptr;
+ const kernel::lmm::Element* nextelem = nullptr;
int numelem = 0;
latency_.peak = value;
- while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
action->lat_current_ += delta;
action->weight_ += delta;
if (action->rate_ < 0)
- model()->get_maxmin_system()->update_variable_bound(action->get_variable(),
- sg_tcp_gamma / (2.0 * action->lat_current_));
+ get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), NetworkModel::cfg_tcp_gamma /
+ (2.0 * action->lat_current_));
else {
- model()->get_maxmin_system()->update_variable_bound(
- action->get_variable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->lat_current_)));
+ get_model()->get_maxmin_system()->update_variable_bound(
+ action->get_variable(), std::min(action->rate_, NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)));
- if (action->rate_ < sg_tcp_gamma / (2.0 * action->lat_current_)) {
+ if (action->rate_ < NetworkModel::cfg_tcp_gamma / (2.0 * action->lat_current_)) {
XBT_INFO("Flow is limited BYBANDWIDTH");
} else {
XBT_INFO("Flow is limited BYLATENCY, latency of flow is %f", action->lat_current_);
}
}
if (not action->is_suspended())
- model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
+ get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
}
}
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()->get_action_heap().remove(this);
}
set_last_update();
