X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a714f2cc13ccf01d24d8848aafc9085aef8eb6ce..8dadf249202bc6834a1d680b8ec8446937b3c4a6:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 80564a2ff8..2cb2d53843 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -27,30 +27,6 @@ class CpuPlugin; *************/ 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(simgrid::surf::signal) 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(simgrid::surf::signal) 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(simgrid::surf::signal) 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(simgrid::surf::signal) cpuActionStateChangedCallbacks; - XBT_PUBLIC(void) cpu_add_traces(); /********* @@ -77,7 +53,7 @@ public: * @param state_initial [TODO] * @param state_trace [TODO] */ - virtual Cpu *createCpu(const char *name, xbt_dynar_t speedPeak, + virtual Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak, int pstate, double speedScale, tmgr_trace_t speedTrace, int core, e_surf_resource_state_t state_initial, @@ -98,42 +74,44 @@ public: */ XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { public: - static simgrid::xbt::FacetLevel LEVEL; - static void init(); Cpu(); /** * @brief Cpu constructor * * @param model The CpuModel associated to this Cpu - * @param name The name of the 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 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, - lmm_constraint_t constraint, int core, double speedPeak, double speedScale, + Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale, e_surf_resource_state_t stateInitial); /** * @brief Cpu constructor * * @param model The CpuModel associated to this Cpu - * @param name The name of the Cpu + * @param host The host in which this Cpu should be plugged * @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, + Cpu(simgrid::surf::Model *model, simgrid::Host *host, + xbt_dynar_t speedPeakList, int pstate, int core, double speedPeak, double speedScale, e_surf_resource_state_t stateInitial); - 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, + Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale); + Cpu(simgrid::surf::Model *model, simgrid::Host *host, + xbt_dynar_t speedPeakList, int pstate, int core, double speedPeak, double speedScale); ~Cpu(); @@ -166,26 +144,23 @@ public: /** @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; - - void setState(e_surf_resource_state_t state); - void plug(simgrid::Host* host); + virtual int getNbPStates(); + virtual void setPState(int pstate_index); + virtual int getPState(); void addTraces(void); simgrid::Host* getHost() { return m_host; } -protected: - virtual void onDie() override; - 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::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; @@ -204,6 +179,11 @@ public: 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 old, e_surf_action_state_t current)` + */ + static simgrid::surf::signal onStateChange; + /** @brief CpuAction constructor */ CpuAction(simgrid::surf::Model *model, double cost, bool failed) : Action(model, cost, failed) {} //FIXME:REMOVE