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
woops
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
76017eb
..
519e744
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-51,7
+51,7
@@
enum trace_type {
class CpuTiTmgr {
public:
CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){};
class CpuTiTmgr {
public:
CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){};
- CpuTiTmgr(tmgr_trace_t speed
T
race, double value);
+ CpuTiTmgr(tmgr_trace_t speed
_t
race, double value);
CpuTiTmgr(const CpuTiTmgr&) = delete;
CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
~CpuTiTmgr();
CpuTiTmgr(const CpuTiTmgr&) = delete;
CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
~CpuTiTmgr();
@@
-78,10
+78,10
@@
public:
class XBT_PRIVATE CpuTiAction : public CpuAction {
friend class CpuTi;
public:
class XBT_PRIVATE CpuTiAction : public CpuAction {
friend class CpuTi;
public:
- CpuTiAction(CpuTi
Model *model, double cost, bool failed, CpuTi *cpu
);
+ CpuTiAction(CpuTi
* cpu, double cost
);
~CpuTiAction();
~CpuTiAction();
- void set_state(
simgrid::
kernel::resource::Action::State state) override;
+ void set_state(kernel::resource::Action::State state) override;
void cancel() override;
void suspend() override;
void resume() override;
void cancel() override;
void suspend() override;
void resume() override;
@@
-113,13
+113,13
@@
public:
bool is_used() override;
CpuAction *execution_start(double size) override;
bool is_used() override;
CpuAction *execution_start(double size) override;
- simgrid::kernel::resource::Action* execution_start(double size, int requested
C
ores) override
+ simgrid::kernel::resource::Action* execution_start(double size, int requested
_c
ores) override
{
THROW_UNIMPLEMENTED;
return nullptr;
}
CpuAction *sleep(double duration) override;
{
THROW_UNIMPLEMENTED;
return nullptr;
}
CpuAction *sleep(double duration) override;
- double get_
available_speed
() override;
+ double get_
speed_ratio
() override;
void set_modified(bool modified);
void set_modified(bool modified);
@@
-128,8
+128,6
@@
public:
double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */
double last_update_ = 0; /*< last update of actions' remaining amount done */
double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */
double last_update_ = 0; /*< last update of actions' remaining amount done */
- double current_frequency_;
-
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
@@
-141,13
+139,12
@@
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
*********/
class CpuTiModel : public CpuModel {
public:
*********/
class CpuTiModel : public CpuModel {
public:
- CpuTiModel() : CpuModel(Model::UpdateAlgo::F
ull
){};
+ CpuTiModel() : CpuModel(Model::UpdateAlgo::F
ULL
){};
~CpuTiModel() override;
~CpuTiModel() override;
- Cpu* create
C
pu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+ Cpu* create
_c
pu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
double next_occuring_event(double now) override;
void update_actions_state(double now, double delta) override;
double next_occuring_event(double now) override;
void update_actions_state(double now, double delta) override;
- kernel::resource::Action::StateSet runningActionSetThatDoesNotNeedBeingChecked_;
CpuTiList modified_cpus_;
};
CpuTiList modified_cpus_;
};