X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18d23a87c23647366cfffbc61d3f7c632301159c..7f3527d281baac664d10ce7086e0d0138e1389d7:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 7cc5905a7e..757bb99133 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,103 +1,177 @@ -#include "surf_interface.hpp" -#include "maxmin_private.h" +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ + +/* 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. */ #ifndef SURF_CPU_INTERFACE_HPP_ #define SURF_CPU_INTERFACE_HPP_ +#include "simgrid/s4u/Host.hpp" +#include "src/kernel/lmm/maxmin.hpp" + +#include + /*********** * Classes * ***********/ -class CpuModel; -typedef CpuModel *CpuModelPtr; - -class Cpu; -typedef Cpu *CpuPtr; - -class CpuLmm; -typedef CpuLmm *CpuLmmPtr; -class CpuAction; -typedef CpuAction *CpuActionPtr; +namespace simgrid { +namespace surf { -class CpuActionLmm; -typedef CpuActionLmm *CpuActionLmmPtr; - -/********* - * Model * - *********/ -class CpuModel : public Model { + /** @ingroup SURF_cpu_interface + * @brief SURF cpu model interface class + * @details A model is an object which handle the interactions between its Resources and its Actions + */ +XBT_PUBLIC_CLASS CpuModel : public Model { public: - CpuModel(const char *name) : Model(name) {}; - CpuPtr createResource(string name); - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - - virtual void addTraces() =0; + /** + * @brief Create a Cpu + * + * @param host The host that will have this CPU + * @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 + */ + 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; }; /************ * Resource * ************/ -class Cpu : virtual public Resource { + +/** @ingroup SURF_cpu_interface +* @brief SURF cpu resource interface class +* @details A Cpu represent a cpu associated to a host +*/ +XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { public: - Cpu(){}; - Cpu(int core, double powerPeak, double powerScale); - virtual CpuActionPtr execute(double size)=0; - virtual CpuActionPtr sleep(double duration)=0; - virtual int getCore(); + /** + * @brief Cpu constructor + * + * @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 speedPerPstate Processor speed (in flop per second) for each pstate + * @param core The number of core of this Cpu + */ + Cpu(simgrid::surf::Model * model, simgrid::s4u::Host * host, kernel::lmm::Constraint * 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 speedPerPstate Processor speed (in flop per second) for each pstate + * @param core The number of core of this Cpu + */ + Cpu(simgrid::surf::Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core); + + ~Cpu(); + + /** + * @brief Execute some quantity of computation + * + * @param size The value of the processing amount (in flop) needed to process + * @return The CpuAction corresponding to the processing + */ + virtual simgrid::surf::Action *execution_start(double size)=0; + + /** + * @brief Execute some quantity of computation on more than one core + * + * @param size The value of the processing amount (in flop) needed to process + * @param requestedCores The desired amount of cores. Must be >= 1 + * @return The CpuAction corresponding to the processing + */ + virtual simgrid::surf::Action* execution_start(double size, int requestedCores) + { + THROW_UNIMPLEMENTED; + return nullptr; + } + + /** + * @brief Make a process sleep for duration (in seconds) + * + * @param duration The number of seconds to sleep + * @return The CpuAction corresponding to the sleeping + */ + virtual simgrid::surf::Action *sleep(double duration)=0; + + /** @brief Get the amount of cores */ + 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); + +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(); - virtual double getCurrentPowerPeak()=0; - virtual double getPowerPeakAt(int pstate_index)=0; - virtual int getNbPstates()=0; - virtual void setPowerPeakAt(int pstate_index)=0; - virtual double getConsumedEnergy()=0; + /** @brief Get the current Cpu computational speed */ + virtual double getPstateSpeed(int pstate_index); - void addTraces(void); - int m_core; - double m_powerPeak; /*< CPU power peak */ - double m_powerScale; /*< Percentage of CPU disponible */ -protected: + virtual int getNbPStates(); + virtual void setPState(int pstate_index); + virtual int getPState(); - //virtual boost::shared_ptr execute(double size) = 0; - //virtual boost::shared_ptr sleep(double duration) = 0; -}; + simgrid::s4u::Host* getHost() { return host_; } -class CpuLmm : public ResourceLmm, public Cpu { -public: - CpuLmm(lmm_constraint_t constraint); - CpuLmm(lmm_constraint_t constraint, int core, double powerPeak, double powerScale); - ~CpuLmm(); - /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore; - void **p_constraintCoreId; + int coresAmount_ = 1; + simgrid::s4u::Host* host_; + std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ + + 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_event_t stateEvent_ = nullptr; + s_surf_metric_t speed_ = {1.0, 0, nullptr}; }; /********** * Action * **********/ -class CpuAction : virtual public Action { -public: - CpuAction(){}; - CpuAction(ModelPtr model, double cost, bool failed) - : Action(model, cost, failed) {};//FIXME:REMOVE - virtual void setAffinity(CpuPtr cpu, unsigned long mask)=0; - virtual void setBound(double bound)=0; -}; -class CpuActionLmm : public ActionLmm, public CpuAction { + /** @ingroup SURF_cpu_interface + * @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: - CpuActionLmm(){}; - CpuActionLmm(lmm_variable_t var) - : ActionLmm(var), CpuAction() {}; - void updateRemainingLazy(double now); - virtual void updateEnergy()=0; - void setAffinity(CpuPtr cpu, unsigned long mask); - void setBound(double bound); - double m_bound; + /** @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 onShareChange; + + CpuAction(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed) {} + CpuAction(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var) + : Action(model, cost, failed, var) + { + } + + void setState(simgrid::surf::Action::State state) override; + + void updateRemainingLazy(double now) override; + std::list cpus(); + + void suspend() override; + void resume() override; }; +} +} #endif /* SURF_CPU_INTERFACE_HPP_ */