-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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"
+#include "src/kernel/lmm/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);
+ set_default_protocol_function(simgrid::kernel::lmm::func_reno_f, simgrid::kernel::lmm::func_reno_fp,
+ simgrid::kernel::lmm::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::kernel::lmm::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);
+ set_default_protocol_function(simgrid::kernel::lmm::func_reno2_f, simgrid::kernel::lmm::func_reno2_fp,
+ simgrid::kernel::lmm::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::kernel::lmm::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);
+ set_default_protocol_function(simgrid::kernel::lmm::func_vegas_f, simgrid::kernel::lmm::func_vegas_fp,
+ simgrid::kernel::lmm::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::kernel::lmm::lagrange_solve);
all_existing_models->push_back(surf_network_model);
}
if (optim == "Full") {
setUpdateMechanism(UM_FULL);
- selectiveUpdate_ = select;
} else if (optim == "Lazy") {
+ select = true;
setUpdateMechanism(UM_LAZY);
- 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.c_str());
}
- maxminSystem_ = new s_lmm_system_t(selectiveUpdate_);
+ maxmin_system_ = new simgrid::kernel::lmm::System(select);
loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
- if (getUpdateMechanism() == UM_LAZY) {
- modifiedSet_ = new ActionLmmList();
- maxminSystem_->keep_track = modifiedSet_;
- }
+ if (getUpdateMechanism() == UM_LAZY)
+ maxmin_system_->modified_set_ = new kernel::resource::ActionLmmList();
}
-NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self))
- : NetworkCm02Model()
+
+NetworkCm02Model::NetworkCm02Model(void (*specificSolveFun)(lmm_system_t self)) : NetworkCm02Model()
{
- maxminSystem_->solve_fun = specificSolveFun;
+ maxmin_system_->solve_fun = specificSolveFun;
}
LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
{
- return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxminSystem_);
+ return new NetworkCm02Link(this, name, bandwidth, latency, policy, maxmin_system_);
}
void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/)
int n = action->getVariable()->get_number_of_constraint();
for (int i = 0; i < n; i++){
- lmm_constraint_t constraint = action->getVariable()->get_constraint(i);
+ kernel::lmm::Constraint* 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(),
}
// if I am wearing a latency hat
- if (action->getHat() == LATENCY) {
+ if (action->getType() == kernel::resource::Action::Type::LATENCY) {
XBT_DEBUG("Latency paid for action %p. Activating", action);
- maxminSystem_->update_variable_weight(action->getVariable(), action->weight_);
+ maxmin_system_->update_variable_weight(action->getVariable(), action->weight_);
action->heapRemove(getActionHeap());
action->refreshLastUpdate();
// if I am wearing a max_duration or normal hat
- } 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
+ } else if (action->getType() == kernel::resource::Action::Type::MAX_DURATION ||
+ action->getType() == kernel::resource::Action::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->setRemains(0);
- action->finish(Action::State::done);
+ action->finish(kernel::resource::Action::State::done);
action->heapRemove(getActionHeap());
}
}
action.latency_ = 0.0;
}
if (action.latency_ <= 0.0 && not action.isSuspended())
- maxminSystem_->update_variable_weight(action.getVariable(), action.weight_);
+ maxmin_system_->update_variable_weight(action.getVariable(), action.weight_);
}
if (TRACE_is_enabled()) {
int n = action.getVariable()->get_number_of_constraint();
for (int i = 0; i < n; i++) {
- lmm_constraint_t constraint = action.getVariable()->get_constraint(i);
+ kernel::lmm::Constraint* constraint = action.getVariable()->get_constraint(i);
NetworkCm02Link* link = static_cast<NetworkCm02Link*>(constraint->get_id());
TRACE_surf_link_set_utilization(
link->getCname(), action.getCategory(),
if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) ||
((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) {
- action.finish(Action::State::done);
+ action.finish(kernel::resource::Action::State::done);
}
}
}
-Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
int failed = 0;
double latency = 0.0;
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
- action->setVariable(maxminSystem_->variable_new(action, 0.0, -1.0, constraints_per_variable));
+ action->setVariable(maxmin_system_->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);
+ action->heapInsert(getActionHeap(), action->latency_ + action->getLastUpdate(),
+ route.empty() ? kernel::resource::Action::Type::NORMAL
+ : kernel::resource::Action::Type::LATENCY);
}
} else
- action->setVariable(maxminSystem_->variable_new(action, 1.0, -1.0, constraints_per_variable));
+ action->setVariable(maxmin_system_->variable_new(action, 1.0, -1.0, constraints_per_variable));
if (action->rate_ < 0) {
- maxminSystem_->update_variable_bound(action->getVariable(),
- (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0);
+ maxmin_system_->update_variable_bound(
+ action->getVariable(), (action->latCurrent_ > 0) ? sg_tcp_gamma / (2.0 * action->latCurrent_) : -1.0);
} else {
- maxminSystem_->update_variable_bound(action->getVariable(),
- (action->latCurrent_ > 0)
- ? std::min(action->rate_, sg_tcp_gamma / (2.0 * action->latCurrent_))
- : action->rate_);
+ maxmin_system_->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)
- maxminSystem_->expand(link->constraint(), action->getVariable(), 1.0);
+ maxmin_system_->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%%");
+ XBT_DEBUG("Crosstraffic active adding backward flow using 5%%");
for (auto const& link : back_route)
- maxminSystem_->expand(link->constraint(), action->getVariable(), .05);
+ maxmin_system_->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())
- //lmm_variable_concurrency_share_set(action->getVariable(),2);
+ // 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())
+ // action->getVariable()->set_concurrency_share(2)
}
XBT_OUT();
if (value > 0)
turnOn();
else {
- lmm_variable_t var = nullptr;
- lmm_element_t elem = nullptr;
- double now = surf_get_clock();
+ kernel::lmm::Variable* var = nullptr;
+ const_lmm_element_t elem = nullptr;
+ double now = surf_get_clock();
turnOff();
while ((var = constraint()->get_variable(&elem))) {
- Action* action = static_cast<Action*>(var->get_id());
+ kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
- if (action->getState() == Action::State::running ||
- action->getState() == Action::State::ready) {
+ if (action->getState() == kernel::resource::Action::State::running ||
+ action->getState() == kernel::resource::Action::State::ready) {
action->setFinishTime(now);
- action->setState(Action::State::failed);
+ action->setState(kernel::resource::Action::State::failed);
}
}
}
if (sg_weight_S_parameter > 0) {
double delta = sg_weight_S_parameter / value - sg_weight_S_parameter / (bandwidth_.peak * bandwidth_.scale);
- lmm_variable_t var;
- lmm_element_t elem = nullptr;
- lmm_element_t nextelem = nullptr;
- int numelem = 0;
+ kernel::lmm::Variable* var;
+ const_lmm_element_t elem = nullptr;
+ const_lmm_element_t nextelem = nullptr;
+ int numelem = 0;
while ((var = constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
action->weight_ += delta;
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;
+ double delta = value - latency_.peak;
+ kernel::lmm::Variable* var = nullptr;
+ const_lmm_element_t elem = nullptr;
+ const_lmm_element_t nextelem = nullptr;
+ int numelem = 0;
latency_.peak = value;
void NetworkCm02Action::updateRemainingLazy(double now)
{
- if (suspended_ != 0)
+ if (suspended_ != Action::SuspendStates::not_suspended)
return;
double delta = now - getLastUpdate();
