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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
c960134
..
0ee2f30
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-12,7
+12,6
@@
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
-#include "xbt/lib.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
@@
-41,7
+40,7
@@
HostL07Model::HostL07Model() : HostModel() {
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
-HostL07Model::~HostL07Model()
+HostL07Model::~HostL07Model()
{
lmm_system_free(maxminSystem_);
maxminSystem_ = nullptr;
{
lmm_system_free(maxminSystem_);
maxminSystem_ = nullptr;
@@
-188,7
+187,7
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
- for (auto link : route)
+ for (auto
const&
link : route)
affected_links.insert(link->cname());
}
}
affected_links.insert(link->cname());
}
}
@@
-217,7
+216,7
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
std::vector<LinkImpl*> route;
hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
std::vector<LinkImpl*> route;
hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
- for (auto link : route)
+ for (auto
const&
link : route)
lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
bytes_amount[i * host_nb + j]);
}
lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
bytes_amount[i * host_nb + j]);
}