X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9c3452d0a6bdc89e663102456eb7a8e9b085077..1c7dbc7e7255bc670c53414593e9fbdf5b366c1d:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index c2faaf0ac7..2b0b3ec36e 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,15 +1,19 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ -#include "surf_interface.hpp" -#include "maxmin_private.hpp" - #ifndef SURF_CPU_INTERFACE_HPP_ #define SURF_CPU_INTERFACE_HPP_ +#include "simgrid/kernel/resource/Model.hpp" +#include "simgrid/kernel/resource/Resource.hpp" +#include "simgrid/s4u/Host.hpp" +#include "src/kernel/lmm/maxmin.hpp" +#include "src/surf/trace_mgr.hpp" + +#include + /*********** * Classes * ***********/ @@ -17,57 +21,25 @@ namespace simgrid { namespace surf { -class CpuModel; -class Cpu; -class CpuAction; -class CpuPlugin; - -/************* - * Callbacks * - *************/ -XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); - -/** @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(); - -/********* - * 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 { +class XBT_PUBLIC CpuModel : public kernel::resource::Model { public: - CpuModel() : Model() {}; + explicit CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {} /** * @brief Create a Cpu * - * @param name The name of the 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 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 - * @param state_initial [TODO] - * @param state_trace [TODO] */ - virtual Cpu *createCpu(const char *name, xbt_dynar_t speedPeak, - int pstate, double speedScale, - tmgr_trace_t speedTrace, int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace)=0; - - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - bool shareResourcesIsIdempotent() {return true;} + virtual Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) = 0; + + void update_actions_state_lazy(double now, double delta) override; + void update_actions_state_full(double now, double delta) override; }; /************ @@ -78,45 +50,30 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { +class XBT_PUBLIC Cpu : public simgrid::kernel::resource::Resource { public: - static simgrid::xbt::Extension EXTENSION_ID; - 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 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 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, - e_surf_resource_state_t stateInitial); + Cpu(simgrid::kernel::resource::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 name The name of the 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 - * @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, - 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, - int core, double speedPeak, double speedScale); + Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector * speedPerPstate, + int core); ~Cpu(); @@ -126,7 +83,16 @@ 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::kernel::resource::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::kernel::resource::Action* execution_start(double size, int requestedCores) = 0; /** * @brief Make a process sleep for duration (in seconds) @@ -134,44 +100,62 @@ public: * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ - virtual simgrid::surf::Action *sleep(double duration)=0; + virtual simgrid::kernel::resource::Action* sleep(double duration) = 0; /** @brief Get the amount of cores */ - virtual int getCore(); + virtual int get_cores_count(); - /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */ - virtual double getSpeed(double load); + /** @brief Get a forecast of the speed (in flops/s) if the load were as provided. + * + * The provided load should encompasses both the application's activities and the external load that come from a trace. + * + * Use a load of 1.0 to compute the amount of flops that the Cpu would deliver with one CPU-bound task. + * If you use a load of 0, this function will return 0: when nobody is using the Cpu, it delivers nothing. + * + * If you want to know the amount of flops currently delivered, use load = get_load()*get_speed_ratio() + */ + virtual double get_speed(double load); - /** @brief Get the available speed of the current Cpu */ - virtual double getAvailableSpeed(); +protected: + /** @brief Take speed changes (either load or max) into account */ + virtual void on_speed_change(); - /** @brief Get the current Cpu power peak */ - virtual double getCurrentPowerPeak(); +public: + /** @brief Get the available speed ratio, between 0 and 1. + * + * This accounts for external load (see @ref set_speed_trace()). + */ + virtual double get_speed_ratio(); - virtual double getPowerPeakAt(int pstate_index)=0; + /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ + virtual double get_pstate_peak_speed(int pstate_index); - virtual int getNbPstates()=0; - virtual void setPstate(int pstate_index)=0; - virtual int getPstate()=0; + virtual int get_pstates_count(); + virtual void set_pstate(int pstate_index); + virtual int get_pstate(); - void plug(simgrid::Host* host); + simgrid::s4u::Host* get_host() { return host_; } - void addTraces(void); - simgrid::Host* getHost() { return m_host; } +private: + int cores_count_ = 1; + simgrid::s4u::Host* host_; -protected: - virtual void onDie() override; + int pstate_ = 0; /*< Current pstate (index in the speed_per_pstate_)*/ + std::vector speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */ 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; - - /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore=NULL; - void **p_constraintCoreId=NULL; + /** @brief Setup the trace file with states events (ON or OFF). + * Trace must contain boolean values (0 or 1). + */ + virtual void set_state_trace(tmgr_trace_t trace); + /*< @brief Setup the trace file with availability events (peak speed changes due to external load). + * Trace must contain relative values (ratio between 0 and 1) + */ + virtual void set_speed_trace(tmgr_trace_t trace); +protected: + tmgr_trace_event_t state_event_ = nullptr; + Metric speed_ = {1.0, 0, nullptr}; }; /********** @@ -179,30 +163,32 @@ 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); +class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action { public: - /** @brief CpuAction constructor */ - CpuAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:REMOVE - - /** @brief CpuAction constructor */ - 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] + /** @brief Signal emitted when the action state changes (ready/running/done, etc) + * Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)` */ - virtual void setAffinity(Cpu *cpu, unsigned long mask); + 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::kernel::resource::Model * model, double cost, bool failed) : Action(model, cost, failed) {} + CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var) + : Action(model, cost, failed, var) + { + } - void setState(e_surf_action_state_t state); + void set_state(simgrid::kernel::resource::Action::State state) override; - void updateRemainingLazy(double now); + void update_remains_lazy(double now) override; + std::list cpus(); + void suspend() override; + void resume() override; }; }