*************/
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(void) cpu_add_traces();
-
/*********
* Model *
*********/
/**
* @brief Create a Cpu
*
- * @param name The name of the Cpu
+ * @param host The host that will have this CPU
* @param speedPeak The peak spead (max speed in Flops)
* @param pstate [TODO]
* @param speedScale The speed scale (in [O;1] available speed from peak)
* @param speedTrace Trace variations
* @param core The number of core of this Cpu
- * @param state_initial [TODO]
+ * @param initiallyOn [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,
+ virtual Cpu *createCpu(simgrid::s4u::Host *host, 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;
+ int initiallyOn,
+ tmgr_trace_t state_trace)=0;
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
- bool shareResourcesIsIdempotent() {return true;}
+ bool next_occuring_event_isIdempotent() {return true;}
};
/************
*/
XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
public:
- static simgrid::xbt::FacetLevel<simgrid::Host, Cpu> LEVEL;
- static void init();
- Cpu();
-
/**
* @brief Cpu constructor
*
* @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 host The host in which this Cpu should be plugged
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
+ * @param speedPeakList [TODO]
+ * @param pstate [TODO]
* @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
+ * @param initiallyOn whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint, int core, double speedPeak, double speedScale,
- e_surf_resource_state_t stateInitial);
+ 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);
/**
* @brief Cpu constructor
*
* @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 host The host in which this Cpu should be plugged
+ * @param speedPeakList [TODO]
+ * @param pstate
* @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
+ * @param initiallyOn whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- int core, double speedPeak, double speedScale,
- e_surf_resource_state_t stateInitial);
-
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint, int core, double speedPeak, double speedScale);
- Cpu(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- int core, double speedPeak, double speedScale);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
+ xbt_dynar_t speedPeakList, int pstate,
+ int core, double speedPeak, double speedScale,
+ int initiallyOn);
~Cpu();
* @param size The value of the processing amount (in flop) needed to process
* @return The CpuAction corresponding to the processing
*/
- virtual simgrid::surf::Action *execute(double size)=0;
+ virtual simgrid::surf::Action *execution_start(double size)=0;
/**
* @brief Make a process sleep for duration (in seconds)
/** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
virtual double getSpeed(double load);
+protected:
+ /** @brief Take speed changes (either load or max) into account */
+ virtual void onSpeedChange();
+
+public:
/** @brief Get the available speed of the current Cpu */
virtual double getAvailableSpeed();
/** @brief Get the current Cpu power peak */
virtual double getCurrentPowerPeak();
- virtual double getPowerPeakAt(int pstate_index)=0;
+ virtual double getPowerPeakAt(int pstate_index);
- virtual int getNbPstates()=0;
- virtual void setPstate(int pstate_index)=0;
- virtual int getPstate()=0;
+ virtual int getNbPStates();
+ virtual void setPState(int pstate_index);
+ virtual int getPState();
- void setState(e_surf_resource_state_t state);
- void plug(simgrid::Host* host);
+ simgrid::s4u::Host* getHost() { return m_host; }
- void addTraces(void);
+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::Host* m_host = nullptr;
+ simgrid::s4u::Host* m_host;
+
+ xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
+ int m_pstate = 0; /*< Current pstate (index in the speedPeakList)*/
/* Note (hypervisor): */
lmm_constraint_t *p_constraintCore=NULL;
void **p_constraintCoreId=NULL;
+public:
+ virtual void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
+ virtual void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
+
+ tmgr_trace_iterator_t p_stateEvent = nullptr;
+ s_surf_metric_t p_speed = {1.0, 0, nullptr};
};
/**********
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
+/** @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 previous)`
+ */
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> onStateChange;
+
/** @brief CpuAction constructor */
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
- : Action(model, cost, failed) {} //FIXME:REMOVE
+ : Action(model, cost, failed) {} //FIXME:DEADCODE?
/** @brief CpuAction constructor */
CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
