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
/
cpu_cas01.hpp
diff --git
a/src/surf/cpu_cas01.hpp
b/src/surf/cpu_cas01.hpp
index
3a5a2b9
..
cee9934
100644
(file)
--- a/
src/surf/cpu_cas01.hpp
+++ b/
src/surf/cpu_cas01.hpp
@@
-27,8
+27,7
@@
public:
CpuCas01Model();
~CpuCas01Model();
CpuCas01Model();
~CpuCas01Model();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace) override;
+ Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
double next_occuring_event_full(double now) override;
ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
};
double next_occuring_event_full(double now) override;
ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
};
@@
-39,8
+38,7
@@
public:
class CpuCas01 : public Cpu {
public:
class CpuCas01 : public Cpu {
public:
- CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core, tmgr_trace_t stateTrace) ;
+ CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
~CpuCas01();
void apply_event(tmgr_trace_iterator_t event, double value) override;
CpuAction *execution_start(double size) override;
~CpuCas01();
void apply_event(tmgr_trace_iterator_t event, double value) override;
CpuAction *execution_start(double size) override;