/* } */
void surf_network_model_init_LegrandVelho()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
- all_existing_models->push_back(surf_network_model);
simgrid::config::set_default<double>("network/latency-factor", 13.01);
simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
/* } */
void surf_network_model_init_CM02()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
simgrid::config::set_default<double>("network/latency-factor", 1.0);
simgrid::config::set_default<double>("network/bandwidth-factor", 1.0);
simgrid::config::set_default<double>("network/weight-S", 0.0);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
- all_existing_models->push_back(surf_network_model);
}
/***************************************************************************/
/* } */
void surf_network_model_init_Reno()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
- using namespace simgrid::kernel;
+ 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/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
- all_existing_models->push_back(surf_network_model);
}
void surf_network_model_init_Reno2()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
- using namespace simgrid::kernel;
+ 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/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
- all_existing_models->push_back(surf_network_model);
}
void surf_network_model_init_Vegas()
{
- if (surf_network_model)
- return;
+ xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
- using namespace simgrid::kernel;
+ 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/weight-S", 20537);
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 resource {
NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
- : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::Full
- : Model::UpdateAlgo::Lazy)
+ : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
+ : Model::UpdateAlgo::LAZY)
{
+ all_existing_models.push_back(this);
+
std::string optim = simgrid::config::get_value<std::string>("network/optim");
bool select = simgrid::config::get_value<bool>("network/maxmin-selective-update");
}
set_maxmin_system(make_new_lmm_system(select));
- loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+ loopback_ = NetworkCm02Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
}
-LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy)
+LinkImpl* NetworkCm02Model::create_link(const std::string& name, double bandwidth, double latency,
+ s4u::Link::SharingPolicy policy)
{
return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system());
}
// no need to communicate anymore
// assume that flows that reached max_duration have remaining of 0
XBT_DEBUG("Action %p finished", action);
- action->finish(Action::State::done);
+ action->finish(Action::State::FINISHED);
get_action_heap().remove(action);
}
}
void NetworkCm02Model::update_actions_state_full(double now, double delta)
{
- for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+ for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
NetworkCm02Action& action = static_cast<NetworkCm02Action&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
XBT_DEBUG("Something happened to action %p", &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(Action::State::done);
+ action.finish(Action::State::FINISHED);
}
}
}
XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
- src->routeTo(dst, route, &latency);
+ src->route_to(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->get_cname(), dst->get_cname());
bool failed = std::any_of(route.begin(), route.end(), [](LinkImpl* link) { return link->is_off(); });
if (cfg_crosstraffic) {
- dst->routeTo(src, back_route, nullptr);
+ dst->route_to(src, back_route, nullptr);
if (not failed)
failed = std::any_of(back_route.begin(), back_route.end(), [](LinkImpl* const& link) { return link->is_off(); });
}
action->weight_ = latency;
action->latency_ = latency;
action->rate_ = rate;
- if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
+ if (get_update_algorithm() == Model::UpdateAlgo::LAZY) {
action->set_last_update();
}
if (sg_weight_S_parameter > 0) {
action->weight_ =
std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {
- return total + sg_weight_S_parameter / link->bandwidth();
+ return total + sg_weight_S_parameter / link->get_bandwidth();
});
}
- double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth();
+ double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth();
for (auto const& link : route)
- bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth());
+ bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth());
action->lat_current_ = action->latency_;
- action->latency_ *= latencyFactor(size);
- action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size);
+ action->latency_ *= get_latency_factor(size);
+ action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size);
int constraints_per_variable = route.size();
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable));
- if (get_update_algorithm() == 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();
{
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
- setBandwidth(value);
+ set_bandwidth(value);
tmgr_trace_event_unref(&bandwidth_.event);
} else if (triggered == latency_.event) {
- setLatency(value);
+ set_latency(value);
tmgr_trace_event_unref(&latency_.event);
- } else if (triggered == stateEvent_) {
+ } else if (triggered == state_event_) {
if (value > 0)
turn_on();
else {
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::running) {
+ if (action->get_state() == Action::State::INITED || action->get_state() == Action::State::STARTED) {
action->set_finish_time(now);
- action->set_state(Action::State::failed);
+ action->set_state(Action::State::FAILED);
}
}
}
- tmgr_trace_event_unref(&stateEvent_);
+ tmgr_trace_event_unref(&state_event_);
} else {
xbt_die("Unknown event!\n");
}
get_constraint());
}
-void NetworkCm02Link::setBandwidth(double value)
+void NetworkCm02Link::set_bandwidth(double value)
{
bandwidth_.peak = value;
}
}
-void NetworkCm02Link::setLatency(double value)
+void NetworkCm02Link::set_latency(double value)
{
double delta = value - latency_.peak;
kernel::lmm::Variable* var = nullptr;
if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) ||
((max_duration > NO_MAX_DURATION) && (max_duration <= 0))) {
- finish(Action::State::done);
+ finish(Action::State::FINISHED);
get_model()->get_action_heap().remove(this);
}