*************/
XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Cpu creation *
- * @details Callback functions have the following signature: `void(CpuPtr)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, Cpu*)) cpuCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Cpu destruction *
- * @details Callback functions have the following signature: `void(CpuPtr)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, Cpu*)) cpuDestructedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Cpu State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_resource_state_t old, e_surf_resource_state_t current)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t)) cpuStateChangedCallbacks;
-
/** @ingroup SURF_callbacks
* @brief Callbacks handler which emit the callbacks after CpuAction State changed *
* @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t old, e_surf_action_state_t current)`
*/
-XBT_PUBLIC_DATA( surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::surf::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)>) cpuActionStateChangedCallbacks;
XBT_PUBLIC(void) cpu_add_traces();
* @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
*/
virtual Cpu *createCpu(const char *name, xbt_dynar_t speedPeak,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)=0;
+ tmgr_trace_t state_trace)=0;
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
*/
XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
public:
- static simgrid::xbt::FacetLevel<simgrid::Host, Cpu> LEVEL;
- static void init();
+ static simgrid::xbt::Extension<simgrid::Host, Cpu> EXTENSION_ID;
+ static void classInit();
Cpu();
/**
*
* @param model The CpuModel associated to this Cpu
* @param name The name of the Cpu
- * @param props Dictionary of properties associated to this Cpu
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
* @param core The number of core of this Cpu
* @param speedPeak The speed peak of this Cpu in flops (max speed)
* @param speedScale The speed scale of this Cpu in [0;1] (available amount)
* @param stateInitial whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+ Cpu(simgrid::surf::Model *model, const char *name,
lmm_constraint_t constraint, int core, double speedPeak, double speedScale,
e_surf_resource_state_t stateInitial);
*
* @param model The CpuModel associated to this Cpu
* @param name The name of the Cpu
- * @param props Dictionary of properties associated to this Cpu
* @param core The number of core of this Cpu
* @param speedPeak The speed peak of this Cpu in flops (max speed)
* @param speedScale The speed scale of this Cpu in [0;1] (available amount)
* @param stateInitial whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+ Cpu(simgrid::surf::Model *model, const char *name,
int core, double speedPeak, double speedScale,
e_surf_resource_state_t stateInitial);
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+ Cpu(simgrid::surf::Model *model, const char *name,
lmm_constraint_t constraint, int core, double speedPeak, double speedScale);
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+ Cpu(simgrid::surf::Model *model, const char *name,
int core, double speedPeak, double speedScale);
~Cpu();
virtual void setPstate(int pstate_index)=0;
virtual int getPstate()=0;
- void setState(e_surf_resource_state_t state);
void plug(simgrid::Host* host);
void addTraces(void);
+ simgrid::Host* getHost() { return m_host; }
+
+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] */