/* 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 <algorithm>
-
#include "network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
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;
-
/************************************************************************/
/* New model based on optimizations discussed during Pedro Velho's thesis*/
/************************************************************************/
if (surf_network_model)
return;
- surf_network_model = new simgrid::surf::NetworkCm02Model();
+ surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
all_existing_models->push_back(surf_network_model);
xbt_cfg_setdefault_double("network/latency-factor", 13.01);
xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
xbt_cfg_setdefault_double("network/weight-S", 0.0);
- surf_network_model = new simgrid::surf::NetworkCm02Model();
+ surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
all_existing_models->push_back(surf_network_model);
}
xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
xbt_cfg_setdefault_double("network/weight-S", 20537);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
+ surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
}
xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
xbt_cfg_setdefault_double("network/weight-S", 20537);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
+ surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
}
xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
xbt_cfg_setdefault_double("network/weight-S", 20537);
- surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
+ surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
- : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? kernel::resource::Model::UpdateAlgo::Full
- : kernel::resource::Model::UpdateAlgo::Lazy)
+ : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? Model::UpdateAlgo::Full : Model::UpdateAlgo::Lazy)
{
std::string optim = xbt_cfg_get_string("network/optim");
bool select = xbt_cfg_get_boolean("network/maxmin-selective-update");
}
// if I am wearing a latency hat
- if (action->get_type() == kernel::resource::ActionHeap::Type::latency) {
+ if (action->get_type() == ActionHeap::Type::latency) {
XBT_DEBUG("Latency paid for action %p. Activating", action);
get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
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::ActionHeap::Type::max_duration ||
- action->get_type() == kernel::resource::ActionHeap::Type::normal) {
+ } else if (action->get_type() == ActionHeap::Type::max_duration || action->get_type() == 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->finish(Action::State::done);
get_action_heap().remove(action);
}
}
if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) ||
((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
- action.finish(kernel::resource::Action::State::done);
+ action.finish(Action::State::done);
}
}
}
-kernel::resource::Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
+Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
int failed = 0;
double latency = 0.0;
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) {
+ if (cfg_crosstraffic == 1) {
dst->routeTo(src, back_route, nullptr);
for (auto const& link : back_route)
- if (link->isOff())
+ if (link->is_off())
failed = 1;
}
action->weight_ = latency;
action->latency_ = latency;
action->rate_ = rate;
- if (get_update_algorithm() == kernel::resource::Model::UpdateAlgo::Lazy) {
+ if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
action->set_last_update();
}
if (action->latency_ > 0) {
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) {
+ if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
// add to the heap the event when the latency is payed
double date = action->latency_ + action->get_last_update();
- kernel::resource::ActionHeap::Type type;
+ ActionHeap::Type type;
if (route.empty())
- type = kernel::resource::ActionHeap::Type::normal;
+ type = ActionHeap::Type::normal;
else
- type = kernel::resource::ActionHeap::Type::latency;
+ type = ActionHeap::Type::latency;
XBT_DEBUG("Added action (%p) one latency event at date %f", action, date);
get_action_heap().insert(action, date, type);
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
+ if (not back_route.empty()) { // cfg_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))) {
- kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id());
+ turn_off();
+ while ((var = get_constraint()->get_variable(&elem))) {
+ Action* action = static_cast<Action*>(var->get_id());
- if (action->get_state() == kernel::resource::Action::State::running ||
- action->get_state() == kernel::resource::Action::State::ready) {
+ if (action->get_state() == Action::State::running || action->get_state() == Action::State::ready) {
action->set_finish_time(now);
- action->set_state(kernel::resource::Action::State::failed);
+ action->set_state(Action::State::failed);
}
}
}
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));
+ 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);
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_);
}
}
}
}
+} // namespace simgrid