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
Simplify the code taking Cpu::m_speedPeak changes into account
[simgrid.git]
/
src
/
surf
/
host_ptask_L07.cpp
diff --git
a/src/surf/host_ptask_L07.cpp
b/src/surf/host_ptask_L07.cpp
index
5563153
..
e5a7d66
100644
(file)
--- a/
src/surf/host_ptask_L07.cpp
+++ b/
src/surf/host_ptask_L07.cpp
@@
-199,9
+199,9
@@
L07Action::L07Action(Model *model, int host_nb,
xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
- this->p_
edge
List->reserve(host_nb);
+ this->p_
netcard
List->reserve(host_nb);
for (int i = 0; i<host_nb; i++)
for (int i = 0; i<host_nb; i++)
- this->p_
edgeList->push_back(sg_host_edge(host_list[i])
);
+ this->p_
netcardList->push_back(host_list[i]->p_netcard
);
/* Compute the number of affected resources... */
for (int i = 0; i < host_nb; i++) {
/* Compute the number of affected resources... */
for (int i = 0; i < host_nb; i++) {
@@
-214,7
+214,7
@@
L07Action::L07Action(Model *model, int host_nb,
void *_link;
LinkL07 *link;
void *_link;
LinkL07 *link;
- routing_platf->getRouteAndLatency((*this->p_
edgeList)[i], (*this->p_edge
List)[j],
+ routing_platf->getRouteAndLatency((*this->p_
netcardList)[i], (*this->p_netcard
List)[j],
&route, &lat);
latency = MAX(latency, lat);
&route, &lat);
latency = MAX(latency, lat);
@@
-260,7
+260,7
@@
L07Action::L07Action(Model *model, int host_nb,
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
if (bytes_amount[i * host_nb + j] == 0.0)
continue;
- routing_platf->getRouteAndLatency((*this->p_
edgeList)[i], (*this->p_edge
List)[j],
+ routing_platf->getRouteAndLatency((*this->p_
netcardList)[i], (*this->p_netcard
List)[j],
&route, NULL);
xbt_dynar_foreach(route, cpt, _link) {
&route, NULL);
xbt_dynar_foreach(route, cpt, _link) {
@@
-402,7
+402,6
@@
CpuL07::CpuL07(CpuL07Model *model, simgrid::Host *host,
: Cpu(model, host, speedPeakList, pstate,
core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, state_initial)
{
: Cpu(model, host, speedPeakList, pstate,
core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, state_initial)
{
- xbt_assert(m_speedScale > 0, "Power has to be >0");
p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
if (speedTrace)
p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale);
if (speedTrace)
@@
-563,7
+562,7
@@
void L07Action::updateBound()
double lat_bound = -1.0;
int i, j;
double lat_bound = -1.0;
int i, j;
- int hostNb = p_
edge
List->size();
+ int hostNb = p_
netcard
List->size();
for (i = 0; i < hostNb; i++) {
for (j = 0; j < hostNb; j++) {
for (i = 0; i < hostNb; i++) {
for (j = 0; j < hostNb; j++) {
@@
-571,7
+570,7
@@
void L07Action::updateBound()
if (p_communicationAmount[i * hostNb + j] > 0) {
double lat = 0.0;
if (p_communicationAmount[i * hostNb + j] > 0) {
double lat = 0.0;
- routing_platf->getRouteAndLatency((*p_
edgeList)[i], (*p_edge
List)[j],
+ routing_platf->getRouteAndLatency((*p_
netcardList)[i], (*p_netcard
List)[j],
&route, &lat);
lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]);
&route, &lat);
lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]);