X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/029f4e3fda0aaddabf8312586a1a6d73643967fc..afd3a47e007a0f91d206cc2e47b69b4b86970fc2:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 699237c05e..8d2daffe09 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -4,12 +4,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "surf_interface.hpp" -#include "maxmin_private.hpp" - #ifndef SURF_CPU_INTERFACE_HPP_ #define SURF_CPU_INTERFACE_HPP_ +#include "simgrid/s4u/host.hpp" +#include "src/surf/maxmin_private.hpp" + /*********** * Classes * ***********/ @@ -20,16 +20,6 @@ namespace surf { class CpuModel; class Cpu; class CpuAction; -class CpuPlugin; - -/************* - * Callbacks * - *************/ -XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); - -/********* - * Model * - *********/ /** @ingroup SURF_cpu_interface * @brief SURF cpu model interface class @@ -37,29 +27,17 @@ XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); */ XBT_PUBLIC_CLASS CpuModel : public Model { public: - CpuModel() : Model() {}; - /** * @brief Create a 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 speedPerPstate Processor speed (in Flops) of each pstate. This ignores any potential external load coming from a trace. * @param core The number of core of this Cpu - * @param initiallyOn [TODO] - * @param state_trace [TODO] */ - virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - int pstate, double speedScale, - tmgr_trace_t speedTrace, int core, - int initiallyOn, - tmgr_trace_t state_trace)=0; - - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - bool shareResourcesIsIdempotent() {return true;} + virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core)=0; + + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; }; /************ @@ -78,35 +56,21 @@ public: * @param model The CpuModel 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 speedPerPstate Processor speed (in flop per second) for each 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 initiallyOn whether it is created running or crashed */ - 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); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, + std::vector *speedPerPstate, int core); /** * @brief Cpu constructor * * @param model The CpuModel associated to this Cpu * @param host The host in which this Cpu should be plugged - * @param speedPeakList [TODO] - * @param pstate + * @param speedPerPstate Processor speed (in flop per second) for each 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 initiallyOn whether it is created running or crashed */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPeakList, int pstate, - int core, double speedPeak, double speedScale, - int initiallyOn); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); ~Cpu(); @@ -116,7 +80,7 @@ public: * @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) @@ -127,7 +91,7 @@ public: virtual simgrid::surf::Action *sleep(double duration)=0; /** @brief Get the amount of cores */ - virtual int getCore(); + virtual int coreCount(); /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */ virtual double getSpeed(double load); @@ -140,31 +104,29 @@ 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); + /** @brief Get the current Cpu computational speed */ + virtual double getPstateSpeedCurrent(); + virtual double getPstateSpeed(int pstate_index); virtual int getNbPStates(); virtual void setPState(int pstate_index); virtual int getPState(); - void addTraces(void); - simgrid::s4u::Host* getHost() { return m_host; } + simgrid::s4u::Host* getHost() { return 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] */ - simgrid::s4u::Host* m_host; + int coresAmount_ = 1; + simgrid::s4u::Host* host_; - xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */ - int m_pstate = 0; /*< Current pstate (index in the speedPeakList)*/ + std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ - /* Note (hypervisor): */ - 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}; }; /********** @@ -172,35 +134,29 @@ public: **********/ /** @ingroup SURF_cpu_interface - * @brief SURF Cpu action interface class - * @details A CpuAction represent the execution of code on a Cpu + * @brief A CpuAction represents the execution of code on one or several Cpus */ 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)` +/** @brief Signal emitted when the action state changes (ready/running/done, etc) + * Signature: `void(CpuAction *action, simgrid::surf::Action::State previous)` + */ +static simgrid::xbt::signal onStateChange; +/** @brief Signal emitted when the action share changes (amount of flops it gets) + * Signature: `void(CpuAction *action)` */ - static simgrid::xbt::signal onStateChange; +static simgrid::xbt::signal onShareChange; - /** @brief CpuAction constructor */ CpuAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:DEADCODE? - - /** @brief CpuAction constructor */ + : Action(model, cost, failed) {} CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) - : Action(model, cost, failed, var) {} - - /** - * @brief Set the affinity of the current CpuAction - * @details [TODO] - */ - virtual void setAffinity(Cpu *cpu, unsigned long mask); - - void setState(e_surf_action_state_t state); + : Action(model, cost, failed, var) {} - void updateRemainingLazy(double now); + void setState(simgrid::surf::Action::State state) override; + void updateRemainingLazy(double now) override; + std::list cpus(); }; }