X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/581fd733dd72630f9aa9b7528503693bd857bbbd..e709643ef0c5b61c6c878016c418bffa2b1b20cd:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 8eb5a34318..0215897243 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2020. 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. */ @@ -10,7 +10,6 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Host.hpp" #include "src/kernel/lmm/maxmin.hpp" -#include "src/surf/trace_mgr.hpp" #include @@ -19,24 +18,26 @@ ***********/ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { - /** @ingroup SURF_cpu_interface +/** @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 */ -class XBT_PUBLIC CpuModel : public kernel::resource::Model { +class XBT_PUBLIC CpuModel : public Model { public: - explicit CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {} + explicit CpuModel(Model::UpdateAlgo algo) : Model(algo) {} /** * @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 speed_per_pstate 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* create_cpu(simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) = 0; + virtual Cpu* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) = 0; void update_actions_state_lazy(double now, double delta) override; void update_actions_state_full(double now, double delta) override; @@ -46,11 +47,20 @@ public: * Resource * ************/ +class CpuAction; + /** @ingroup SURF_cpu_interface * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -class XBT_PUBLIC Cpu : public simgrid::kernel::resource::Resource { +class XBT_PUBLIC Cpu : public Resource { + int core_count_ = 1; + s4u::Host* host_; + int pstate_ = 0; /*< Current pstate (index in the speed_per_pstate_)*/ + std::vector speed_per_pstate_; /*< List of supported CPU capacities (pstate related). Not 'const' because VCPU + get modified on migration */ + friend simgrid::vm::VirtualMachineImpl; // Resets the VCPU + public: /** * @brief Cpu constructor @@ -61,8 +71,8 @@ public: * @param speedPerPstate Processor speed (in flop per second) for each pstate * @param core The number of core of this Cpu */ - Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, kernel::lmm::Constraint * constraint, - std::vector * speedPerPstate, int core); + Cpu(Model* model, s4u::Host* host, lmm::Constraint* constraint, const std::vector& speed_per_pstate, + int core); /** * @brief Cpu constructor @@ -72,10 +82,10 @@ public: * @param speedPerPstate Processor speed (in flop per second) for each pstate * @param core The number of core of this Cpu */ - Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector * speedPerPstate, - int core); + Cpu(Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); - ~Cpu(); + Cpu(const Cpu&) = delete; + Cpu& operator=(const Cpu&) = delete; /** * @brief Execute some quantity of computation @@ -83,16 +93,16 @@ public: * @param size The value of the processing amount (in flop) needed to process * @return The CpuAction corresponding to the processing */ - virtual simgrid::kernel::resource::Action* execution_start(double size) = 0; + virtual CpuAction* 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 + * @param requested_cores 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; + virtual CpuAction* execution_start(double size, int requested_cores) = 0; /** * @brief Make a process sleep for duration (in seconds) @@ -100,7 +110,7 @@ public: * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ - virtual simgrid::kernel::resource::Action* sleep(double duration) = 0; + virtual CpuAction* sleep(double duration) = 0; /** @brief Get the amount of cores */ virtual int get_core_count(); @@ -114,12 +124,19 @@ public: * * If you want to know the amount of flops currently delivered, use load = get_load()*get_speed_ratio() */ - virtual double get_speed(double load); + virtual double get_speed(double load) const; protected: /** @brief Take speed changes (either load or max) into account */ virtual void on_speed_change(); + /** Reset most characteristics of this CPU to the one of that CPU. + * + * Used to reset a VCPU when its VM migrates to another host, so it only resets the fields that should be in this + *case. + **/ + virtual void reset_vcpu(Cpu* that); + public: /** @brief Get the available speed ratio, between 0 and 1. * @@ -128,33 +145,20 @@ public: virtual double get_speed_ratio(); /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ - virtual double get_pstate_peak_speed(int pstate_index); + virtual double get_pstate_peak_speed(int pstate_index) const; - virtual int get_pstate_count(); + virtual int get_pstate_count() const; virtual void set_pstate(int pstate_index); - virtual int get_pstate(); - - simgrid::s4u::Host* get_host() { return host_; } + virtual int get_pstate() const; -private: - int core_count_ = 1; - simgrid::s4u::Host* host_; - - int pstate_ = 0; /*< Current pstate (index in the speed_per_pstate_)*/ - std::vector speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */ + s4u::Host* get_host() { return host_; } -public: - /** @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); + virtual void set_speed_profile(profile::Profile* profile); protected: - tmgr_trace_event_t state_event_ = nullptr; Metric speed_ = {1.0, 0, nullptr}; }; @@ -165,33 +169,26 @@ protected: /** @ingroup SURF_cpu_interface * @brief A CpuAction represents the execution of code on one or several Cpus */ -class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action { +class XBT_PUBLIC CpuAction : public Action { public: /** @brief Signal emitted when the action state changes (ready/running/done, etc) - * Signature: `void(CpuAction *action)` + * Signature: `void(CpuAction const& action, simgrid::kernel::resource::Action::State previous)` */ - static simgrid::xbt::signal on_state_change; - /** @brief Signal emitted when the action share changes (amount of flops it gets) - * Signature: `void(CpuAction *action)` - */ - static simgrid::xbt::signal onShareChange; + static xbt::signal on_state_change; - 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) - { - } + CpuAction(Model* model, double cost, bool failed) : Action(model, cost, failed) {} + CpuAction(Model* model, double cost, bool failed, lmm::Variable* var) : Action(model, cost, failed, var) {} - void set_state(simgrid::kernel::resource::Action::State state) override; + void set_state(Action::State state) override; void update_remains_lazy(double now) override; - std::list cpus(); + std::list cpus() const; void suspend() override; void resume() override; }; - -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* SURF_CPU_INTERFACE_HPP_ */