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
[mc] Remove redundant 'mc_mode' global variable
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
1c5d3ec
..
9d3491d
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-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,12
+110,10
@@
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 speedPeak,
- int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t stateTrace) ;
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
~CpuTi();
~CpuTi();
- void set
_speed_t
race(tmgr_trace_t trace) override;
+ void set
SpeedT
race(tmgr_trace_t trace) override;
void apply_event(tmgr_trace_iterator_t event, double value) override;
void updateActionsFinishTime(double now);
void apply_event(tmgr_trace_iterator_t event, double value) override;
void updateActionsFinishTime(double now);
@@
-128,10
+126,10
@@
public:
void modified(bool modified);
void modified(bool modified);
- CpuTiTgmr *
availTrace_;
/*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_; /*< set with all actions running on cpu */
- double sumPriority_
;
/*< the sum of actions' priority that are running on cpu */
- double lastUpdate_ = 0;
/*< last update of actions' remaining amount done */
+ CpuTiTgmr *
speedIntegratedTrace_ = NULL;
/*< Structure with data needed to integrate trace file */
+ ActionTiList *actionSet_
= NULL
; /*< set with all actions running on cpu */
+ double sumPriority_
= 0;
/*< the sum of actions' priority that are running on cpu */
+ double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
double currentFrequency_;
double currentFrequency_;
@@
-149,10
+147,7
@@
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
~CpuTiModel();
public:
CpuTiModel();
~CpuTiModel();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale,
- tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t state_trace) 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;