X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22a45a8d97ef0f1211ee05f9c16d7d90b37cf33b..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 72a99af01e..cdecf0e16d 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-2019. 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,6 +10,7 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Host.hpp" #include "src/kernel/lmm/maxmin.hpp" +#include "src/kernel/resource/profile/trace_mgr.hpp" #include @@ -26,17 +27,17 @@ namespace surf { */ class XBT_PUBLIC CpuModel : public kernel::resource::Model { public: - CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {} - CpuModel() : Model() {} + explicit CpuModel(kernel::resource::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 *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core)=0; + virtual Cpu* create_cpu(simgrid::s4u::Host* host, 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; @@ -75,6 +76,8 @@ public: Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector * speedPerPstate, int core); + Cpu(const Cpu&) = delete; + Cpu& operator=(const Cpu&) = delete; ~Cpu(); /** @@ -89,10 +92,10 @@ public: * @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 simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) = 0; /** * @brief Make a process sleep for duration (in seconds) @@ -103,38 +106,53 @@ public: virtual simgrid::kernel::resource::Action* sleep(double duration) = 0; /** @brief Get the amount of cores */ - virtual int coreCount(); + virtual int get_core_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); protected: /** @brief Take speed changes (either load or max) into account */ - virtual void onSpeedChange(); + virtual void on_speed_change(); public: - /** @brief Get the available speed of the current Cpu */ - virtual double getAvailableSpeed(); + /** @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(); - /** @brief Get the current Cpu computational speed */ - virtual double getPstateSpeed(int pstate_index); + /** @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(); - virtual void setPState(int pstate_index); - virtual int getPState(); + virtual int get_pstate_count(); + virtual void set_pstate(int pstate_index); + virtual int get_pstate(); - simgrid::s4u::Host* getHost() { return host_; } + simgrid::s4u::Host* get_host() { return host_; } - int coresAmount_ = 1; +private: + int core_count_ = 1; simgrid::s4u::Host* host_; - std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ - int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ + int pstate_ = 0; /*< Current pstate (index in the speed_per_pstate_)*/ + std::vector speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */ - 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) */ +public: + /*< @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_profile(kernel::profile::Profile* profile); - tmgr_trace_event_t stateEvent_ = nullptr; +protected: Metric speed_ = {1.0, 0, nullptr}; }; @@ -146,17 +164,11 @@ public: * @brief A CpuAction represents the execution of code on one or several Cpus */ class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action { - friend XBT_PUBLIC Cpu* getActionCpu(CpuAction * action); - public: /** @brief Signal emitted when the action state changes (ready/running/done, etc) * Signature: `void(CpuAction *action, simgrid::kernel::resource::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; + static simgrid::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) @@ -168,7 +180,7 @@ public: void update_remains_lazy(double now) override; std::list cpus(); - + void suspend() override; void resume() override; };