X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2653a7d76628a32b362df6a1336fd36a744796d2..6a53589d043ef92bb71eeac8dae8a6b1497b2f97:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5ccd0c3e52..1b050c8082 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -13,6 +13,10 @@ /*********** * Classes * ***********/ + +namespace simgrid { +namespace surf { + class CpuModel; class Cpu; class CpuAction; @@ -21,33 +25,7 @@ class CpuPlugin; /************* * Callbacks * *************/ -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(); +XBT_PUBLIC(std::list) getActionCpus(CpuAction *action); /********* * Model * @@ -64,26 +42,16 @@ public: /** * @brief Create a Cpu * - * @param name The name of the 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 host The host that will have this CPU + * @param speedPeak The peak spead (max speed in Flops when no external load comes from a trace) + * @param speedTrace Speed variations * @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 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; + virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, tmgr_trace_t speedTrace, int core)=0; void updateActionsStateLazy(double now, double delta); void updateActionsStateFull(double now, double delta); - bool shareResourcesIsIdempotent() {return true;} + bool next_occuring_event_isIdempotent() {return true;} }; /************ @@ -94,43 +62,32 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public Resource { +XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { public: - 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 core The number of core of this Cpu - * @param powerPeak The power peak of this Cpu - * @param powerScale The power scale of this Cpu + * @param speedPeak The speed peak of this Cpu in flops (max speed) */ - Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale, - e_surf_resource_state_t stateInitial); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, + lmm_constraint_t constraint, xbt_dynar_t speedPeakList, int core, double speedPeak); /** * @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 core The number of core of this Cpu - * @param powerPeak The power peak of this Cpu in [TODO] - * @param powerScale The power scale of this Cpu in [TODO] + * @param speedPeak The speed peak of this Cpu in flops (max speed) */ - Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale, - e_surf_resource_state_t stateInitial); - - Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale); - Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, + xbt_dynar_t speedPeakList, int core, double speedPeak); ~Cpu(); @@ -140,7 +97,7 @@ public: * @param size The value of the processing amount (in flop) needed to process * @return The CpuAction corresponding to the processing */ - virtual Action *execute(double size)=0; + virtual simgrid::surf::Action *execution_start(double size)=0; /** * @brief Make a process sleep for duration (in seconds) @@ -148,36 +105,50 @@ public: * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ - virtual Action *sleep(double duration)=0; + virtual simgrid::surf::Action *sleep(double duration)=0; - /** @brief Get the number of cores of the current Cpu */ + /** @brief Get the amount of cores */ virtual int getCore(); - /** @brief Get the speed of the current Cpu */ + /** @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); + simgrid::s4u::Host* getHost() { return host_; } - void addTraces(void); - 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] */ +public: + int coresAmount_ = 1; + simgrid::s4u::Host* host_; + + xbt_dynar_t speedPeakList_ = NULL; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore; - void **p_constraintCoreId; + lmm_constraint_t *p_constraintCore=NULL; + void **p_constraintCoreId=NULL; + +public: + virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */ + virtual void setSpeedTrace(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 stateEvent_ = nullptr; + s_surf_metric_t speed_ = {1.0, 0, nullptr}; }; /********** @@ -188,15 +159,20 @@ public: * @brief SURF Cpu action interface class * @details A CpuAction represent the execution of code on a Cpu */ -XBT_PUBLIC_CLASS CpuAction : public Action { +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 onStateChange; + /** @brief CpuAction constructor */ - CpuAction(Model *model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:REMOVE + CpuAction(simgrid::surf::Model *model, double cost, bool failed) + : Action(model, cost, failed) {} //FIXME:DEADCODE? /** @brief CpuAction constructor */ - CpuAction(Model *model, double cost, bool failed, lmm_variable_t var) + CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {} /** @@ -211,4 +187,7 @@ public: }; +} +} + #endif /* SURF_CPU_INTERFACE_HPP_ */