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
more explicit error messages
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
3f531d8
..
7f5e474
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-32,7
+32,7
@@
struct tiTag;
*********/
class CpuTiTrace {
public:
*********/
class CpuTiTrace {
public:
- CpuTiTrace(tmgr_trace_t speedTrace);
+
explicit
CpuTiTrace(tmgr_trace_t speedTrace);
~CpuTiTrace();
double integrateSimple(double a, double b);
~CpuTiTrace();
double integrateSimple(double a, double b);
@@
-84,7
+84,7
@@
class CpuTiAction: public CpuAction {
public:
CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
public:
CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
- void setState(
e_surf_action_state_t
state) override;
+ void setState(
simgrid::surf::Action::State
state) override;
int unref() override;
void cancel() override;
void updateIndexHeap(int i);
int unref() override;
void cancel() override;
void updateIndexHeap(int i);
@@
-110,8
+110,8
@@
typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
************/
class CpuTi : public Cpu {
public:
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPe
ak, tmgr_trace_t speedTrac
e, int core);
- ~CpuTi();
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPe
rPstat
e, int core);
+ ~CpuTi()
override
;
void setSpeedTrace(tmgr_trace_t trace) override;
void setSpeedTrace(tmgr_trace_t trace) override;
@@
-146,9
+146,8
@@
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
- ~CpuTiModel();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core) override;
+ ~CpuTiModel() override;
+ Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
double next_occuring_event(double now) override;
void updateActionsState(double now, double delta) override;
double next_occuring_event(double now) override;
void updateActionsState(double now, double delta) override;