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
make trace_connect_list_host_speed private as it should
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
a9820c4
..
f479e39
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-55,7
+55,7
@@
class CpuTiTgmr {
public:
CpuTiTgmr(trace_type type, double value)
: m_type(type), m_value(value)
public:
CpuTiTgmr(trace_type type, double value)
: m_type(type), m_value(value)
-
{};
+ {};
CpuTiTgmr(tmgr_trace_t speedTrace, double value);
~CpuTiTgmr();
CpuTiTgmr(tmgr_trace_t speedTrace, double value);
~CpuTiTgmr();
@@
-118,10
+118,12
@@
public:
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuTi();
- void set_speed_trace(tmgr_trace_t trace);
+ void set_speed_trace(tmgr_trace_t trace)
override
;
- void
updateState(tmgr_trace_iterator_t event_type, double value, double dat
e) override;
+ void
apply_event(tmgr_trace_iterator_t event_type, double valu
e) override;
void updateActionsFinishTime(double now);
void updateActionsFinishTime(double now);
+ void updateRemainingAmount(double now);
+
bool isUsed() override;
CpuAction *execution_start(double size) override;
CpuAction *sleep(double duration) override;
bool isUsed() override;
CpuAction *execution_start(double size) override;
CpuAction *sleep(double duration) override;
@@
-136,7
+138,6
@@
public:
double current_frequency;
double current_frequency;
- void updateRemainingAmount(double now);
public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
@@
-157,7
+158,7
@@
public:
tmgr_trace_t speedTrace, int core,
int initiallyOn,
tmgr_trace_t state_trace) override;
tmgr_trace_t speedTrace, int core,
int initiallyOn,
tmgr_trace_t state_trace) override;
- double
shareResources
(double now) override;
+ double
next_occuring_event
(double now) override;
void updateActionsState(double now, double delta) override;
void addTraces() override;
void updateActionsState(double now, double delta) override;
void addTraces() override;