/* 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 <numeric>
-
#include "network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
+#include <algorithm>
+#include <numeric>
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
}
-/***************************************************************************/
-/* The models from Steven H. Low */
-/***************************************************************************/
-/* @article{Low03, */
-/* author={Steven H. Low}, */
-/* title={A Duality Model of {TCP} and Queue Management Algorithms}, */
-/* year={2003}, */
-/* journal={{IEEE/ACM} Transactions on Networking}, */
-/* volume={11}, number={4}, */
-/* } */
-void surf_network_model_init_Reno()
-{
- xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
-
- namespace lmm = simgrid::kernel::lmm;
- lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
-
- simgrid::config::set_default<double>("network/latency-factor", 13.01);
- simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
- simgrid::config::set_default<double>("network/weight-S", 20537);
-
- surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
-}
-
-
-void surf_network_model_init_Reno2()
-{
- xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
-
- namespace lmm = simgrid::kernel::lmm;
- lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
-
- simgrid::config::set_default<double>("network/latency-factor", 13.01);
- simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
- simgrid::config::set_default<double>("network/weight-S", 20537);
-
- surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
-}
-
-void surf_network_model_init_Vegas()
-{
- xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
-
- namespace lmm = simgrid::kernel::lmm;
- lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
-
- simgrid::config::set_default<double>("network/latency-factor", 13.01);
- simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
- simgrid::config::set_default<double>("network/weight-S", 20537);
-
- surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
-}
-
namespace simgrid {
namespace kernel {
namespace resource {
// if I am wearing a latency hat
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_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
get_action_heap().remove(action);
action->set_last_update();
}
}
-void NetworkCm02Model::update_actions_state_full(double now, double delta)
+void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta)
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
NetworkCm02Action& action = static_cast<NetworkCm02Action&>(*it);
action.latency_ = 0.0;
}
if (action.latency_ <= 0.0 && not action.is_suspended())
- get_maxmin_system()->update_variable_weight(action.get_variable(), action.weight_);
+ get_maxmin_system()->update_variable_penalty(action.get_variable(), action.sharing_penalty_);
}
if (not action.get_variable()->get_number_of_constraint()) {
}
action.update_remains(action.get_variable()->get_value() * delta);
- if (action.get_max_duration() > NO_MAX_DURATION)
+ if (action.get_max_duration() != NO_MAX_DURATION)
action.update_max_duration(delta);
- if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) ||
- ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+ if (((action.get_remains() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
+ ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(Action::State::FINISHED);
}
}
}
NetworkCm02Action *action = new NetworkCm02Action(this, size, failed);
- action->weight_ = latency;
+ action->sharing_penalty_ = latency;
action->latency_ = latency;
action->rate_ = rate;
if (get_update_algorithm() == Model::UpdateAlgo::LAZY) {
}
if (sg_weight_S_parameter > 0) {
- action->weight_ =
- std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {
+ action->sharing_penalty_ =
+ std::accumulate(route.begin(), route.end(), action->sharing_penalty_, [](double total, LinkImpl* const& link) {
return total + sg_weight_S_parameter / link->get_bandwidth();
});
}
}
XBT_OUT();
- simgrid::s4u::Link::on_communicate(action, src, dst);
+ simgrid::s4u::Link::on_communicate(*action, src, dst);
return action;
}
if (value > 0)
turn_on();
else {
- kernel::lmm::Variable* var = nullptr;
- const kernel::lmm::Element* elem = nullptr;
- double now = surf_get_clock();
-
turn_off();
- while ((var = get_constraint()->get_variable(&elem))) {
- Action* action = static_cast<Action*>(var->get_id());
-
- if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED) {
- action->set_finish_time(now);
- action->set_state(Action::State::FAILED);
- }
- }
}
tmgr_trace_event_unref(&state_event_);
} else {
int numelem = 0;
while ((var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem))) {
NetworkCm02Action* action = static_cast<NetworkCm02Action*>(var->get_id());
- action->weight_ += delta;
+ action->sharing_penalty_ += delta;
if (not action->is_suspended())
- get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
+ get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
}
}
}
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;
+ action->sharing_penalty_ += delta;
if (action->rate_ < 0)
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), NetworkModel::cfg_tcp_gamma /
(2.0 * action->lat_current_));
}
}
if (not action->is_suspended())
- get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), action->weight_);
+ get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
}
}
void NetworkCm02Action::update_remains_lazy(double now)
{
- if (suspended_ != Action::SuspendStates::not_suspended)
+ if (not is_running())
return;
- double delta = now - get_last_update();
- double max_duration = get_max_duration();
+ double delta = now - get_last_update();
if (get_remains_no_update() > 0) {
XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
XBT_DEBUG("Updating action(%p): remains is now %f", this, get_remains_no_update());
}
- if (max_duration > NO_MAX_DURATION) {
- double_update(&max_duration, delta, sg_surf_precision);
- set_max_duration(max_duration);
- }
+ update_max_duration(delta);
- if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) ||
- ((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) {
+ if ((get_remains_no_update() <= 0 && (get_variable()->get_penalty() > 0)) ||
+ ((get_max_duration() != NO_MAX_DURATION) && (get_max_duration() <= 0))) {
finish(Action::State::FINISHED);
get_model()->get_action_heap().remove(this);
}
