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
[sonar] Replace redundant type with "auto" (include/ and src/).
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
19e985e
..
fb4cb6e
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-1,9
+1,10
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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 "ptask_L07.hpp"
/* 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 "ptask_L07.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
@@
-56,7
+57,10
@@
NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
: NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
{
set_maxmin_system(sys);
: NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
{
set_maxmin_system(sys);
- loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+ loopback_ = NetworkL07Model::create_link("__loopback__",
+ std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
+ simgrid::config::get_value<double>("network/loopback-lat"),
+ s4u::Link::SharingPolicy::FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
}
NetworkL07Model::~NetworkL07Model()
@@
-64,13
+68,13
@@
NetworkL07Model::~NetworkL07Model()
set_maxmin_system(nullptr);
}
set_maxmin_system(nullptr);
}
-double HostL07Model::next_occuring_event(double now)
+double HostL07Model::next_occur
r
ing_event(double now)
{
{
- double min = HostModel::next_occuring_event_full(now);
+ double min = HostModel::next_occur
r
ing_event_full(now);
for (kernel::resource::Action const& action : *get_started_action_set()) {
for (kernel::resource::Action const& action : *get_started_action_set()) {
- const
L07Action
& net_action = static_cast<const L07Action&>(action);
- if (net_action.
latency_ > 0 && (min < 0 || net_action.latency_
< min)) {
- min = net_action.
latency_
;
+ const
auto
& net_action = static_cast<const L07Action&>(action);
+ if (net_action.
get_latency() > 0 && (min < 0 || net_action.get_latency()
< min)) {
+ min = net_action.
get_latency()
;
XBT_DEBUG("Updating min with %p (start %f): %f", &net_action, net_action.get_start_time(), min);
}
}
XBT_DEBUG("Updating min with %p (start %f): %f", &net_action, net_action.get_start_time(), min);
}
}
@@
-82,17
+86,17
@@
double HostL07Model::next_occuring_event(double now)
void HostL07Model::update_actions_state(double /*now*/, double delta)
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
void HostL07Model::update_actions_state(double /*now*/, double delta)
{
for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
-
L07Action
& action = static_cast<L07Action&>(*it);
+
auto
& action = static_cast<L07Action&>(*it);
++it; // increment iterator here since the following calls to action.finish() may invalidate it
++it; // increment iterator here since the following calls to action.finish() may invalidate it
- if (action.
latency_
> 0) {
- if (action.
latency_
> delta) {
-
double_update(&(action.latency_),
delta, sg_surf_precision);
+ if (action.
get_latency()
> 0) {
+ if (action.
get_latency()
> delta) {
+
action.update_latency(
delta, sg_surf_precision);
} else {
} else {
- action.
latency_ = 0.0
;
+ action.
set_latency(0.0)
;
}
}
- if ((action.
latency_
<= 0.0) && (action.is_suspended() == 0)) {
+ if ((action.
get_latency()
<= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
action.updateBound();
- get_maxmin_system()->update_variable_
weight
(action.get_variable(), 1.0);
+ get_maxmin_system()->update_variable_
penalty
(action.get_variable(), 1.0);
action.set_last_update();
}
}
action.set_last_update();
}
}
@@
-109,7
+113,7
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
* If it's not done, it may have failed.
*/
* If it's not done, it may have failed.
*/
- if (((action.get_remains() <= 0) && (action.get_variable()->get_
weight
() > 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(kernel::resource::Action::State::FINISHED);
continue;
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::FINISHED);
continue;
@@
-117,11
+121,11
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
/* Need to check that none of the model has failed */
int i = 0;
/* Need to check that none of the model has failed */
int i = 0;
- kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
+
const
kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
while (cnst != nullptr) {
i++;
-
void
* constraint_id = cnst->get_id();
- if (not
static_cast<simgrid::kernel::resource::Resource*>(constraint_id)
->is_on()) {
+
const kernel::resource::Resource
* constraint_id = cnst->get_id();
+ if (not
constraint_id
->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
@@
-131,16
+135,16
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
}
}
}
}
-kernel::resource::Action* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
- const double* flops_amount, const double* bytes_amount,
- double rate)
+kernel::resource::
Cpu
Action* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
+
const double* flops_amount, const double* bytes_amount,
+
double rate)
{
return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount, double rate)
{
return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount, double rate)
- : CpuAction(model, 1
, 0
), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate)
+ : CpuAction(model, 1
.0, false
), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate)
{
size_t link_nb = 0;
size_t used_host_nb = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
{
size_t link_nb = 0;
size_t used_host_nb = 0; /* Only the hosts with something to compute (>0 flops) are counted) */
@@
-179,7
+183,7
@@
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host
model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
- model->get_maxmin_system()->update_variable_
weight
(get_variable(), 0.0);
+ model->get_maxmin_system()->update_variable_
penalty
(get_variable(), 0.0);
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* communication either */
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* communication either */
@@
-208,8
+212,8
@@
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host
kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
std::vector<s4u::Host*> host_list = {src, dst};
kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
std::vector<s4u::Host*> host_list = {src, dst};
-
double* flops_amount
= new double[2]();
-
double* bytes_amount
= new double[4]();
+
const auto* flops_amount
= new double[2]();
+
auto* bytes_amount
= new double[4]();
bytes_amount[1] = size;
bytes_amount[1] = size;
@@
-223,10
+227,11
@@
kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vecto
return new CpuL07(this, host, speed_per_pstate, core);
}
return new CpuL07(this, host, speed_per_pstate, core);
}
-kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name,
double bandwidth, double latency
,
- s4u::Link::SharingPolicy policy)
+kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name,
const std::vector<double>& bandwidths
,
+
double latency,
s4u::Link::SharingPolicy policy)
{
{
- return new LinkL07(this, name, bandwidth, latency, policy);
+ xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth.");
+ return new LinkL07(this, name, bandwidths[0], latency, policy);
}
/************
}
/************
@@
-251,28
+256,28
@@
LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid
if (policy == s4u::Link::SharingPolicy::FATPIPE)
get_constraint()->unshare();
if (policy == s4u::Link::SharingPolicy::FATPIPE)
get_constraint()->unshare();
- s4u::Link::on_creation(
this->piface_
);
+ s4u::Link::on_creation(
*get_iface()
);
}
}
-kernel::resource::Action* CpuL07::execution_start(double size)
+kernel::resource::
Cpu
Action* CpuL07::execution_start(double size)
{
std::vector<s4u::Host*> host_list = {get_host()};
{
std::vector<s4u::Host*> host_list = {get_host()};
-
double
* flops_amount = new double[host_list.size()]();
+
auto
* flops_amount = new double[host_list.size()]();
flops_amount[0] = size;
flops_amount[0] = size;
- kernel::resource::Action* res =
+ kernel::resource::
Cpu
Action* res =
static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-kernel::resource::Action* CpuL07::sleep(double duration)
+kernel::resource::
Cpu
Action* CpuL07::sleep(double duration)
{
{
-
L07Action *
action = static_cast<L07Action*>(execution_start(1.0));
+
auto*
action = static_cast<L07Action*>(execution_start(1.0));
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
- get_model()->get_maxmin_system()->update_variable_
weight
(action->get_variable(), 0.0);
+ get_model()->get_maxmin_system()->update_variable_
penalty
(action->get_variable(), 0.0);
return action;
}
return action;
}
@@
-285,12
+290,12
@@
bool CpuL07::is_used()
/** @brief take into account changes of speed (either load or max) */
void CpuL07::on_speed_change()
{
/** @brief take into account changes of speed (either load or max) */
void CpuL07::on_speed_change()
{
-
kernel::lmm::Variable* var = nullpt
r;
+
const kernel::lmm::Variable* va
r;
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
while ((var = get_constraint()->get_variable(&elem))) {
const kernel::lmm::Element* elem = nullptr;
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale);
while ((var = get_constraint()->get_variable(&elem))) {
-
kernel::resource::Action* action = static_cast<kernel::resource::Action*>(var->get_id()
);
+
const kernel::resource::Action* action = var->get_id(
);
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
}
get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak);
}
@@
-314,7
+319,7
@@
void CpuL07::apply_event(kernel::profile::Event* triggered, double value)
} else if (triggered == state_event_) {
if (value > 0) {
if (not is_on()) {
} else if (triggered == state_event_) {
if (value > 0) {
if (not is_on()) {
- XBT_VERB("Restart
processe
s on host %s", get_host()->get_cname());
+ XBT_VERB("Restart
actor
s on host %s", get_host()->get_cname());
get_host()->turn_on();
}
} else
get_host()->turn_on();
}
} else
@@
-359,7
+364,7
@@
void LinkL07::set_bandwidth(double value)
void LinkL07::set_latency(double value)
{
void LinkL07::set_latency(double value)
{
-
kernel::lmm::Variable* var = nullpt
r;
+
const kernel::lmm::Variable* va
r;
L07Action *action;
const kernel::lmm::Element* elem = nullptr;
L07Action *action;
const kernel::lmm::Element* elem = nullptr;
@@
-392,7
+397,6
@@
void L07Action::updateBound()
if (communicationAmount_ != nullptr) {
for (size_t i = 0; i < host_count; i++) {
for (size_t j = 0; j < host_count; j++) {
if (communicationAmount_ != nullptr) {
for (size_t i = 0; i < host_count; i++) {
for (size_t j = 0; j < host_count; j++) {
-
if (communicationAmount_[i * host_count + j] > 0) {
double lat = 0.0;
std::vector<kernel::resource::LinkImpl*> route;
if (communicationAmount_[i * host_count + j] > 0) {
double lat = 0.0;
std::vector<kernel::resource::LinkImpl*> route;