X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef33b9c0c2c0e9c15c27fce82515a23e8aadc0ed..afd3a47e007a0f91d206cc2e47b69b4b86970fc2:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5aa2b4bd4b..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,24 +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 when no external load comes from a trace) - * @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 state_trace [TODO] */ - virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - tmgr_trace_t speedTrace, int core, - tmgr_trace_t state_trace)=0; + virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core)=0; - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - bool next_occuring_event_isIdempotent() {return true;} + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; }; /************ @@ -73,24 +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 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) */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, - lmm_constraint_t constraint, xbt_dynar_t speedPeakList, int core, double speedPeak); + 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 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) */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPeakList, int core, double speedPeak); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); ~Cpu(); @@ -111,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); @@ -124,10 +104,9 @@ 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); @@ -139,12 +118,8 @@ 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=NULL; - void **p_constraintCoreId=NULL; + std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ 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). */ @@ -159,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; +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 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(); }; }