#include <algorithm>
-#include "maxmin_private.hpp"
#include "network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "surf/maxmin.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
if (surf_network_model)
return;
- lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
+ lmm_set_default_protocol_function(simgrid::surf::func_reno_f, simgrid::surf::func_reno_fp,
+ simgrid::surf::func_reno_fpi);
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);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve);
all_existing_models->push_back(surf_network_model);
}
if (surf_network_model)
return;
- lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi);
+ lmm_set_default_protocol_function(simgrid::surf::func_reno2_f, simgrid::surf::func_reno2_fp,
+ simgrid::surf::func_reno2_fpi);
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);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve);
all_existing_models->push_back(surf_network_model);
}
if (surf_network_model)
return;
- lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
+ lmm_set_default_protocol_function(simgrid::surf::func_vegas_f, simgrid::surf::func_vegas_fp,
+ simgrid::surf::func_vegas_fpi);
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);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve);
+ surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve);
all_existing_models->push_back(surf_network_model);
}
xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim.c_str());
}
- maxminSystem_ = lmm_system_new(selectiveUpdate_);
+ maxminSystem_ = new s_lmm_system_t(selectiveUpdate_);
loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
if (getUpdateMechanism() == UM_LAZY) {
NetworkCm02Action* action = static_cast<NetworkCm02Action*>(actionHeapPop());
XBT_DEBUG("Something happened to action %p", action);
if (TRACE_is_enabled()) {
- int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action->getVariable());
+ int n = action->getVariable()->get_number_of_constraint();
for (int i = 0; i < n; i++){
- lmm_constraint_t constraint = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
- 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);
+ lmm_constraint_t constraint = action->getVariable()->get_constraint(i);
+ NetworkCm02Link* link = static_cast<NetworkCm02Link*>(constraint->get_id());
+ double value = action->getVariable()->get_value() * action->getVariable()->get_constraint_weight(i);
TRACE_surf_link_set_utilization(link->getCname(), action->getCategory(), value, action->getLastUpdate(),
now - action->getLastUpdate());
}
// if I am wearing a latency hat
if (action->getHat() == LATENCY) {
XBT_DEBUG("Latency paid for action %p. Activating", action);
- lmm_update_variable_weight(maxminSystem_, action->getVariable(), action->weight_);
+ maxminSystem_->update_variable_weight(action->getVariable(), action->weight_);
action->heapRemove(getActionHeap());
action->refreshLastUpdate();
action.latency_ = 0.0;
}
if (action.latency_ <= 0.0 && not action.isSuspended())
- lmm_update_variable_weight(maxminSystem_, action.getVariable(), action.weight_);
+ maxminSystem_->update_variable_weight(action.getVariable(), action.weight_);
}
if (TRACE_is_enabled()) {
- int n = lmm_get_number_of_cnst_from_var(maxminSystem_, action.getVariable());
+ int n = action.getVariable()->get_number_of_constraint();
for (int i = 0; i < n; i++) {
- 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->getCname(), action.getCategory(),
- (lmm_variable_getvalue(action.getVariable()) *
- lmm_get_cnst_weight_from_var(maxminSystem_, action.getVariable(), i)),
- action.getLastUpdate(), now - action.getLastUpdate());
+ lmm_constraint_t constraint = action.getVariable()->get_constraint(i);
+ NetworkCm02Link* link = static_cast<NetworkCm02Link*>(constraint->get_id());
+ TRACE_surf_link_set_utilization(
+ link->getCname(), action.getCategory(),
+ (action.getVariable()->get_value() * action.getVariable()->get_constraint_weight(i)),
+ action.getLastUpdate(), now - action.getLastUpdate());
}
}
- if (not lmm_get_number_of_cnst_from_var(maxminSystem_, action.getVariable())) {
+ if (not action.getVariable()->get_number_of_constraint()) {
/* 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.
*/
action.updateRemains(action.getRemains());
}
- action.updateRemains(lmm_variable_getvalue(action.getVariable()) * delta);
+ action.updateRemains(action.getVariable()->get_value() * delta);
if (action.getMaxDuration() > NO_MAX_DURATION)
action.updateMaxDuration(delta);
- if (((action.getRemains() <= 0) && (lmm_get_variable_weight(action.getVariable()) > 0)) ||
+ if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) ||
((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) {
action.finish(Action::State::done);
}
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
- action->setVariable(lmm_variable_new(maxminSystem_, action, 0.0, -1.0, constraints_per_variable));
+ action->setVariable(maxminSystem_->variable_new(action, 0.0, -1.0, constraints_per_variable));
if (getUpdateMechanism() == 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->latency_ + action->getLastUpdate());
action->heapInsert(getActionHeap(), action->latency_ + action->getLastUpdate(), route.empty() ? NORMAL : LATENCY);
}
} else
- action->setVariable(lmm_variable_new(maxminSystem_, action, 1.0, -1.0, constraints_per_variable));
+ action->setVariable(maxminSystem_->variable_new(action, 1.0, -1.0, constraints_per_variable));
if (action->rate_ < 0) {
- lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0);
+ maxminSystem_->update_variable_bound(action->getVariable(),
+ (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0);
} else {
- lmm_update_variable_bound(maxminSystem_, action->getVariable(), (action->latCurrent_ > 0) ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)) : action->rate_);
+ maxminSystem_->update_variable_bound(action->getVariable(),
+ (action->latCurrent_ > 0)
+ ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))
+ : action->rate_);
}
for (auto const& link : route)
- lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), 1.0);
+ maxminSystem_->expand(link->constraint(), action->getVariable(), 1.0);
if (not back_route.empty()) { // sg_network_crosstraffic was activated
XBT_DEBUG("Fullduplex active adding backward flow using 5%%");
for (auto const& link : back_route)
- lmm_expand(maxminSystem_, link->constraint(), action->getVariable(), .05);
+ maxminSystem_->expand(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())
************/
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& 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))
+ : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth))
{
bandwidth_.scale = 1.0;
bandwidth_.peak = bandwidth;
latency_.peak = latency;
if (policy == SURF_LINK_FATPIPE)
- lmm_constraint_shared(constraint());
+ constraint()->unshare();
simgrid::s4u::Link::onCreation(this->piface_);
}
double now = surf_get_clock();
turnOff();
- while ((var = lmm_get_var_from_cnst(model()->getMaxminSystem(), constraint(), &elem))) {
- Action *action = static_cast<Action*>( lmm_variable_id(var) );
+ while ((var = constraint()->get_variable(&elem))) {
+ Action* action = static_cast<Action*>(var->get_id());
if (action->getState() == Action::State::running ||
action->getState() == Action::State::ready) {
void NetworkCm02Link::setBandwidth(double value)
{
-
bandwidth_.peak = value;
- lmm_update_constraint_bound(model()->getMaxminSystem(), constraint(),
- sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale));
+ model()->getMaxminSystem()->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);
if (sg_weight_S_parameter > 0) {
lmm_element_t elem = nullptr;
lmm_element_t nextelem = nullptr;
int numelem = 0;
- while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
- NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_variable_id(var));
+ while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
action->weight_ += delta;
if (not action->isSuspended())
- lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
+ model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_);
}
}
}
latency_.peak = value;
- while ((var = lmm_get_var_from_cnst_safe(model()->getMaxminSystem(), constraint(), &elem, &nextelem, &numelem))) {
- NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_variable_id(var));
+ while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
+ NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
action->latCurrent_ += delta;
action->weight_ += delta;
if (action->rate_ < 0)
- lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(),
- sg_tcp_gamma / (2.0 * action->latCurrent_));
+ model()->getMaxminSystem()->update_variable_bound(action->getVariable(),
+ sg_tcp_gamma / (2.0 * action->latCurrent_));
else {
- lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(),
- std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)));
+ model()->getMaxminSystem()->update_variable_bound(
+ action->getVariable(), std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_)));
if (action->rate_ < sg_tcp_gamma / (2.0 * action->latCurrent_)) {
XBT_INFO("Flow is limited BYBANDWIDTH");
}
}
if (not action->isSuspended())
- lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), action->weight_);
+ model()->getMaxminSystem()->update_variable_weight(action->getVariable(), action->weight_);
}
}
setMaxDuration(max_duration);
}
- if ((getRemainsNoUpdate() <= 0 && (lmm_get_variable_weight(getVariable()) > 0)) ||
+ if ((getRemainsNoUpdate() <= 0 && (getVariable()->get_weight() > 0)) ||
((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) {
finish(Action::State::done);
heapRemove(getModel()->getActionHeap());
}
refreshLastUpdate();
- setLastValue(lmm_variable_getvalue(getVariable()));
+ setLastValue(getVariable()->get_value());
}
}