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] Cleanup MC init code (split MCer and MCed init)
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
4991eb4
..
c4bc20c
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-54,6
+54,10
@@
XBT_PUBLIC_DATA( surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_res
*/
XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
*/
XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
+XBT_PUBLIC(void) cpu_parse_init(sg_platf_host_cbarg_t host);
+
+XBT_PUBLIC(void) cpu_add_traces();
+
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-62,7
+66,7
@@
XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf
* @brief SURF cpu model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
* @brief SURF cpu model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
-
class
CpuModel : public Model {
+
XBT_PUBLIC_CLASS
CpuModel : public Model {
public:
/**
* @brief CpuModel constructor
public:
/**
* @brief CpuModel constructor
@@
-75,17
+79,24
@@
public:
* @brief Create a Cpu
*
* @param name The name of the Cpu
* @brief Create a Cpu
*
* @param name The name of the Cpu
- *
- * @return The created Cpu
+ * @param power_peak The power peak of this Cpu
+ * @param pstate [TODO]
+ * @param power_scale The power scale of this Cpu
+ * @param power_trace [TODO]
+ * @param core The number of core of this Cpu
+ * @param state_initial [TODO]
+ * @param state_trace [TODO]
+ * @param cpu_properties Dictionary of properties associated to this Cpu
*/
*/
- CpuPtr createResource(string name);
-
- void setState(e_surf_resource_state_t state);
+ virtual CpuPtr createCpu(const char *name, xbt_dynar_t power_peak,
+ 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)=0;
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
-
- virtual void addTraces() =0;
};
/************
};
/************
@@
-96,7
+107,7
@@
public:
* @brief SURF cpu resource interface class
* @details A Cpu represent a cpu associated to a workstation
*/
* @brief SURF cpu resource interface class
* @details A Cpu represent a cpu associated to a workstation
*/
-
class
Cpu : public Resource {
+
XBT_PUBLIC_CLASS
Cpu : public Resource {
public:
/**
* @brief Cpu constructor
public:
/**
* @brief Cpu constructor
@@
-181,7
+192,7
@@
public:
*
* @return The current Cpu power peak
*/
*
* @return The current Cpu power peak
*/
- virtual double getCurrentPowerPeak()
=0
;
+ virtual double getCurrentPowerPeak();
virtual double getPowerPeakAt(int pstate_index)=0;
virtual double getPowerPeakAt(int pstate_index)=0;
@@
-210,7
+221,7
@@
public:
* @brief SURF Cpu action interface class
* @details A CpuAction represent the execution of code on a Cpu
*/
* @brief SURF Cpu action interface class
* @details A CpuAction represent the execution of code on a Cpu
*/
-
class
CpuAction : public Action {
+
XBT_PUBLIC_CLASS
CpuAction : public Action {
friend CpuPtr getActionCpu(CpuActionPtr action);
public:
/**
friend CpuPtr getActionCpu(CpuActionPtr action);
public:
/**