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 a few more commented lines of code.
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
7d4e26e
..
22eac86
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-164,7
+164,7
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
}
}
}
}
-/** @brief Start a new execution on this CPU lasting @size flops and using one core */
+/** @brief Start a new execution on this CPU lasting @
param
size flops and using one core */
CpuAction *CpuCas01::execution_start(double size)
{
return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
CpuAction *CpuCas01::execution_start(double size)
{
return new CpuCas01Action(model(), size, isOff(), speed_.scale * speed_.peak, constraint());
@@
-209,7
+209,8
@@
CpuAction *CpuCas01::sleep(double duration)
**********/
CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint,
int requestedCore)
**********/
CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm_constraint_t constraint,
int requestedCore)
- : CpuAction(model, cost, failed, lmm_variable_new(model->getMaxminSystem(), this, 1.0, speed, 1))
+ : CpuAction(model, cost, failed,
+ lmm_variable_new(model->getMaxminSystem(), this, 1.0 / requestedCore, requestedCore * speed, 1))
, requestedCore_(requestedCore)
{
if (model->getUpdateMechanism() == UM_LAZY) {
, requestedCore_(requestedCore)
{
if (model->getUpdateMechanism() == UM_LAZY) {