X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9966aa66acc63c0417fbeae8e3ff12bccb0cdb0..1c7dbc7e7255bc670c53414593e9fbdf5b366c1d:/src/surf/cpu_interface.hpp?ds=sidebyside diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index bc04a19294..2b0b3ec36e 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. 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. */ @@ -6,10 +6,11 @@ #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/kernel/resource/Model.hpp" -#include "src/kernel/resource/Resource.hpp" +#include "src/surf/trace_mgr.hpp" #include @@ -24,9 +25,10 @@ namespace surf { * @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 kernel::resource::Model -{ +class XBT_PUBLIC CpuModel : public kernel::resource::Model { public: + explicit CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {} + /** * @brief Create a Cpu * @@ -34,10 +36,10 @@ public: * @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; + virtual Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) = 0; - void updateActionsStateLazy(double now, double delta) override; - void updateActionsStateFull(double now, double delta) override; + void update_actions_state_lazy(double now, double delta) override; + void update_actions_state_full(double now, double delta) override; }; /************ @@ -48,8 +50,7 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::resource::Resource -{ +class XBT_PUBLIC Cpu : public simgrid::kernel::resource::Resource { public: /** * @brief Cpu constructor @@ -91,11 +92,7 @@ public: * @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) - { - THROW_UNIMPLEMENTED; - return nullptr; - } + virtual simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) = 0; /** * @brief Make a process sleep for duration (in seconds) @@ -106,38 +103,58 @@ public: virtual simgrid::kernel::resource::Action* sleep(double duration) = 0; /** @brief Get the amount of cores */ - virtual int coreCount(); + 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); 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_pstates_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 cores_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 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); - tmgr_trace_event_t stateEvent_ = nullptr; +protected: + tmgr_trace_event_t state_event_ = nullptr; Metric speed_ = {1.0, 0, nullptr}; }; @@ -148,10 +165,7 @@ public: /** @ingroup SURF_cpu_interface * @brief A CpuAction represents the execution of code on one or several Cpus */ -XBT_PUBLIC_CLASS CpuAction : public simgrid::kernel::resource::Action -{ - friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction* action); - +class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action { public: /** @brief Signal emitted when the action state changes (ready/running/done, etc) * Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)` @@ -168,11 +182,11 @@ public: { } - void setState(simgrid::kernel::resource::Action::State state) override; + void set_state(simgrid::kernel::resource::Action::State state) override; - void updateRemainingLazy(double now) override; + void update_remains_lazy(double now) override; std::list cpus(); - + void suspend() override; void resume() override; };