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
sunday bug chase
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index 14e5cb136b875c0fa70d3ea1e022d8e0003385e2..68203b56874f1988a3b91bbb86e63cf55efd6540 100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-53,7
+53,6
@@
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
{
maxminSystem_ = sys;
}
-CpuL07Model::~CpuL07Model() = default;
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
: NetworkModel()
@@
-62,8
+61,6
@@
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
maxminSystem_ = sys;
loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
-NetworkL07Model::~NetworkL07Model() = default;
-
double HostL07Model::nextOccuringEvent(double now)
{
@@
-99,7
+96,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
} else {
action->latency_ = 0.0;
}
- if ((action->latency_
=
= 0.0) && (action->isSuspended() == 0)) {
+ if ((action->latency_
<
= 0.0) && (action->isSuspended() == 0)) {
action->updateBound();
lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0);
}
@@
-108,7
+105,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta);
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->getMaxDuration()
!=
NO_MAX_DURATION)
+ if (action->getMaxDuration()
>
NO_MAX_DURATION)
action->updateMaxDuration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains());
@@
-120,7
+117,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
*/
if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
- ((action->getMaxDuration()
!=
NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
+ ((action->getMaxDuration()
>
NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
action->finish();
action->setState(Action::State::done);
} else {
@@
-159,8
+156,11
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
double latency = 0.0;
this->hostList_->reserve(host_nb);
- for (int i = 0; i
<host_nb; i++)
+ for (int i = 0; i
< host_nb; i++) {
this->hostList_->push_back(host_list[i]);
+ if (flops_amount[i] > 0)
+ nb_used_host++;
+ }
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
@@
-185,10
+185,6
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
nb_link = affected_links.size();
}
- for (int i = 0; i < host_nb; i++)
- if (flops_amount[i] > 0)
- nb_used_host++;
-
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
this->latency_ = latency;
@@
-411,7
+407,7
@@
void L07Action::updateBound()
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_
=
= 0.0) && (suspended_ == 0)) {
+ if ((latency_
<
= 0.0) && (suspended_ == 0)) {
if (rate_ < 0)
lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else