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_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
27bcee0
..
d565730
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-59,7
+59,7
@@
public:
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
- bool
shareResourcesI
sIdempotent() {return true;}
+ bool
next_occuring_event_i
sIdempotent() {return true;}
};
/************
};
/************
@@
-87,9
+87,9
@@
public:
*/
Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
lmm_constraint_t constraint,
*/
Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
lmm_constraint_t constraint,
-
xbt_dynar_t speedPeakList, int pstate,
-
int core, double speedPeak, double speedScale,
-
int initiallyOn);
+ xbt_dynar_t speedPeakList, int pstate,
+ int core, double speedPeak, double speedScale,
+ int initiallyOn);
/**
* @brief Cpu constructor
/**
* @brief Cpu constructor
@@
-105,8
+105,8
@@
public:
*/
Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
xbt_dynar_t speedPeakList, int pstate,
*/
Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
xbt_dynar_t speedPeakList, int pstate,
-
int core, double speedPeak, double speedScale,
-
int initiallyOn);
+ int core, double speedPeak, double speedScale,
+ int initiallyOn);
~Cpu();
~Cpu();
@@
-153,8
+153,6
@@
public:
public:
int m_core = 1; /* Amount of cores */
public:
int m_core = 1; /* Amount of cores */
- double m_speedPeak; /*< CPU speed peak, ie max value */
- double m_speedScale; /*< Percentage of CPU available according to the trace, in [O,1] */
simgrid::s4u::Host* m_host;
xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
simgrid::s4u::Host* m_host;
xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
@@
-165,11
+163,11
@@
public:
void **p_constraintCoreId=NULL;
public:
void **p_constraintCoreId=NULL;
public:
- void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF) */
- void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load) */
-protected:
+ v
irtual v
oid set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF) */
+ v
irtual v
oid set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load) */
+
tmgr_trace_iterator_t p_stateEvent = nullptr;
tmgr_trace_iterator_t p_stateEvent = nullptr;
-
tmgr_trace_iterator_t p_speedEvent = nullptr
;
+
s_surf_metric_t p_speed = {1.0, 0, nullptr}
;
};
/**********
};
/**********