A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused type definitions.
[simgrid.git]
/
src
/
surf
/
network_cm02.cpp
diff --git
a/src/surf/network_cm02.cpp
b/src/surf/network_cm02.cpp
index
e334a3e
..
2f78a0d
100644
(file)
--- a/
src/surf/network_cm02.cpp
+++ b/
src/surf/network_cm02.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. 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. */
/* 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. */
@@
-34,11
+34,9
@@
double sg_weight_S_parameter = 0.0; /* default value; can be set by model or
/* } */
void surf_network_model_init_LegrandVelho()
{
/* } */
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();
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);
simgrid::config::set_default<double>("network/latency-factor", 13.01);
simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
@@
-58,15
+56,13
@@
void surf_network_model_init_LegrandVelho()
/* } */
void surf_network_model_init_CM02()
{
/* } */
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();
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);
}
/***************************************************************************/
}
/***************************************************************************/
@@
-81,8
+77,7
@@
void surf_network_model_init_CM02()
/* } */
void surf_network_model_init_Reno()
{
/* } */
void surf_network_model_init_Reno()
{
- if (surf_network_model)
- return;
+ 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);
namespace lmm = simgrid::kernel::lmm;
lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
@@
-92,14
+87,12
@@
void surf_network_model_init_Reno()
simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
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()
{
}
void surf_network_model_init_Reno2()
{
- if (surf_network_model)
- return;
+ 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);
namespace lmm = simgrid::kernel::lmm;
lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
@@
-109,13
+102,11
@@
void surf_network_model_init_Reno2()
simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
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()
{
}
void surf_network_model_init_Vegas()
{
- if (surf_network_model)
- return;
+ 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);
namespace lmm = simgrid::kernel::lmm;
lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
@@
-125,7
+116,6
@@
void surf_network_model_init_Vegas()
simgrid::config::set_default<double>("network/weight-S", 20537);
surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
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 simgrid {
@@
-136,6
+126,8
@@
NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
: 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");
std::string optim = simgrid::config::get_value<std::string>("network/optim");
bool select = simgrid::config::get_value<bool>("network/maxmin-selective-update");
@@
-146,11
+138,11
@@
NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
}
set_maxmin_system(make_new_lmm_system(select));
}
set_maxmin_system(make_new_lmm_system(select));
- loopback_ = NetworkCm02Model::create
L
ink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+ loopback_ = NetworkCm02Model::create
_l
ink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
}
}
-LinkImpl* NetworkCm02Model::create
L
ink(const std::string& name, double bandwidth, double latency,
- s4u::Link::SharingPolicy policy)
+LinkImpl* NetworkCm02Model::create
_l
ink(const std::string& name, double bandwidth, double latency,
+
s4u::Link::SharingPolicy policy)
{
return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system());
}
{
return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system());
}
@@
-180,7
+172,7
@@
void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
}
}
}
}
-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);
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
NetworkCm02Action& action = static_cast<NetworkCm02Action&>(*it);
@@
-207,11
+199,11
@@
void NetworkCm02Model::update_actions_state_full(double now, double delta)
}
action.update_remains(action.get_variable()->get_value() * delta);
}
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.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))) {
+ ((action.get_max_duration()
!=
NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(Action::State::FINISHED);
}
}
action.finish(Action::State::FINISHED);
}
}
@@
-226,16
+218,17
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
src->route_to(dst, route, &latency);
XBT_IN("(%s,%s,%g,%g)", src->get_cname(), dst->get_cname(), size, rate);
src->route_to(dst, route, &latency);
- xbt_assert(not route.empty() || latency,
+ xbt_assert(not route.empty() || latency
> 0
,
"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());
"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
(); });
+ bool failed = std::any_of(route.begin(), route.end(), [](
const LinkImpl* link) { return not link->is_on
(); });
if (cfg_crosstraffic) {
dst->route_to(src, back_route, nullptr);
if (not failed)
if (cfg_crosstraffic) {
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(); });
+ failed =
+ std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); });
}
NetworkCm02Action *action = new NetworkCm02Action(this, size, failed);
}
NetworkCm02Action *action = new NetworkCm02Action(this, size, failed);
@@
-253,16
+246,16
@@
Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
});
}
});
}
- double bandwidth_bound = route.empty() ? -1.0 :
bandwidthF
actor(size) * route.front()->get_bandwidth();
+ double bandwidth_bound = route.empty() ? -1.0 :
get_bandwidth_f
actor(size) * route.front()->get_bandwidth();
for (auto const& link : route)
for (auto const& link : route)
- bandwidth_bound = std::min(bandwidth_bound,
bandwidthF
actor(size) * link->get_bandwidth());
+ bandwidth_bound = std::min(bandwidth_bound,
get_bandwidth_f
actor(size) * link->get_bandwidth());
action->lat_current_ = action->latency_;
action->lat_current_ = action->latency_;
- action->latency_ *=
latencyF
actor(size);
- action->rate_ =
bandwidthC
onstraint(action->rate_, bandwidth_bound, size);
+ action->latency_ *=
get_latency_f
actor(size);
+ action->rate_ =
get_bandwidth_c
onstraint(action->rate_, bandwidth_bound, size);
-
in
t constraints_per_variable = route.size();
+
size_
t constraints_per_variable = route.size();
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
constraints_per_variable += back_route.size();
if (action->latency_ > 0) {
@@
-326,7
+319,7
@@
NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
simgrid::s4u::Link::on_creation(this->piface_);
}
simgrid::s4u::Link::on_creation(this->piface_);
}
-void NetworkCm02Link::apply_event(
tmgr_trace_event_t
triggered, double value)
+void NetworkCm02Link::apply_event(
kernel::profile::Event*
triggered, double value)
{
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
{
/* Find out which of my iterators was triggered, and react accordingly */
if (triggered == bandwidth_.event) {
@@
-431,7
+424,6
@@
void NetworkCm02Action::update_remains_lazy(double now)
return;
double delta = now - get_last_update();
return;
double delta = now - get_last_update();
- double max_duration = get_max_duration();
if (get_remains_no_update() > 0) {
XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
if (get_remains_no_update() > 0) {
XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, get_remains_no_update(),
@@
-441,13
+433,10
@@
void NetworkCm02Action::update_remains_lazy(double now)
XBT_DEBUG("Updating action(%p): remains is now %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)) ||
if ((get_remains_no_update() <= 0 && (get_variable()->get_weight() > 0)) ||
- ((
max_duration > NO_MAX_DURATION) && (max_duration
<= 0))) {
+ ((
get_max_duration() != NO_MAX_DURATION) && (get_max_duration()
<= 0))) {
finish(Action::State::FINISHED);
get_model()->get_action_heap().remove(this);
}
finish(Action::State::FINISHED);
get_model()->get_action_heap().remove(this);
}