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
Fix tesh-simdag-flatifier
[simgrid.git]
/
src
/
surf
/
workstation_ptask_L07.hpp
diff --git
a/src/surf/workstation_ptask_L07.hpp
b/src/surf/workstation_ptask_L07.hpp
index
9bcac9f
..
7dd2691
100644
(file)
--- a/
src/surf/workstation_ptask_L07.hpp
+++ b/
src/surf/workstation_ptask_L07.hpp
@@
-75,6
+75,12
@@
public:
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties);
+ CpuPtr createResource(const char *name, xbt_dynar_t powerPeak,
+ int pstate, double power_scale,
+ tmgr_trace_t power_trace, int core,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties);
void addTraces() {DIE_IMPOSSIBLE;};
WorkstationL07ModelPtr p_workstationModel;
void addTraces() {DIE_IMPOSSIBLE;};
WorkstationL07ModelPtr p_workstationModel;
@@
-120,20
+126,16
@@
public:
};
class CpuL07 : public Cpu {
};
class CpuL07 : public Cpu {
-public:
- s_surf_metric_t p_power;
+ friend void WorkstationL07Model::addTraces();
tmgr_trace_event_t p_stateEvent;
tmgr_trace_event_t p_stateEvent;
-
+ tmgr_trace_event_t p_powerEvent;
public:
CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties,
public:
CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t properties,
- double power_scale,
- double power_initial, tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
+ double power_scale, double power_initial, tmgr_trace_t power_trace,
+ int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace);
bool isUsed();
//bool isUsed() {DIE_IMPOSSIBLE;};
void updateState(tmgr_trace_event_t event_type, double value, double date);
bool isUsed();
//bool isUsed() {DIE_IMPOSSIBLE;};
void updateState(tmgr_trace_event_t event_type, double value, double date);
- double getSpeed(double load);
- double getAvailableSpeed();
CpuActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;};
CpuActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;};
CpuActionPtr execute(double /*size*/) {DIE_IMPOSSIBLE;};
CpuActionPtr sleep(double /*duration*/) {DIE_IMPOSSIBLE;};
@@
-142,8
+144,6
@@
public:
int getNbPstates() {THROW_UNIMPLEMENTED;};
void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
double getConsumedEnergy() {THROW_UNIMPLEMENTED;};
int getNbPstates() {THROW_UNIMPLEMENTED;};
void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;};
double getConsumedEnergy() {THROW_UNIMPLEMENTED;};
-
- double m_powerCurrent;
};
class LinkL07 : public NetworkLink {
};
class LinkL07 : public NetworkLink {