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 pull request #50 from mpoquet/master
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
d8df612
..
5615633
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-113,7
+113,7
@@
typedef boost::intrusive::list<
************/
class CpuTi : public Cpu {
public:
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+ CpuTi(CpuTiModel *model, simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
@@
-152,11
+152,11
@@
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
~CpuTiModel();
public:
CpuTiModel();
~CpuTiModel();
- Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak,
+ Cpu *createCpu(simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
- tmgr_trace_t state_trace);
+ tmgr_trace_t state_trace)
override
;
double shareResources(double now) override;
void updateActionsState(double now, double delta) override;
void addTraces() override;
double shareResources(double now) override;
void updateActionsState(double now, double delta) override;
void addTraces() override;