X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4580d8ca126c4e18a4b98263ab3a3da47db009f8..8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5aa2b4bd4b..81a9cb77bc 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,15 +1,18 @@ -/* 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 + /*********** * Classes * ***********/ @@ -17,44 +20,25 @@ namespace simgrid { namespace surf { -class CpuModel; -class Cpu; -class CpuAction; -class CpuPlugin; - -/************* - * Callbacks * - *************/ -XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); - -/********* - * 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 host The host that will have this CPU - * @param speedPeak The peak spead (max speed in Flops when no external load comes from a trace) - * @param speedTrace Trace variations + * @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_trace [TODO] */ - virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - tmgr_trace_t speedTrace, int core, - tmgr_trace_t state_trace)=0; + virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core)=0; - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - bool next_occuring_event_isIdempotent() {return true;} + void update_actions_state_lazy(double now, double delta) override; + void update_actions_state_full(double now, double delta) override; }; /************ @@ -65,7 +49,7 @@ 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: /** * @brief Cpu constructor @@ -73,24 +57,22 @@ public: * @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 speedPeakList [TODO] + * @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) */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, - lmm_constraint_t constraint, xbt_dynar_t speedPeakList, int core, double speedPeak); + 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 host The host in which this Cpu should be plugged - * @param speedPeakList [TODO] + * @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) */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPeakList, int core, double speedPeak); + Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector * speedPerPstate, + int core); ~Cpu(); @@ -100,7 +82,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 *execution_start(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) @@ -108,10 +99,10 @@ 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 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); @@ -122,12 +113,10 @@ protected: public: /** @brief Get the available speed of the current Cpu */ - virtual double getAvailableSpeed(); + virtual double get_available_speed(); - /** @brief Get the current Cpu power peak */ - virtual double getCurrentPowerPeak(); - - virtual double getPowerPeakAt(int pstate_index); + /** @brief Get the current Cpu computational speed */ + virtual double getPstateSpeed(int pstate_index); virtual int getNbPStates(); virtual void setPState(int pstate_index); @@ -135,23 +124,19 @@ public: simgrid::s4u::Host* getHost() { return host_; } -public: int coresAmount_ = 1; simgrid::s4u::Host* host_; - xbt_dynar_t speedPeakList_ = NULL; /*< List of supported CPU capacities (pstate related) */ - int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ - - /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore=NULL; - void **p_constraintCoreId=NULL; + std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ -public: 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) */ + virtual void + set_speed_trace(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_iterator_t stateEvent_ = nullptr; - s_surf_metric_t speed_ = {1.0, 0, nullptr}; + tmgr_trace_event_t stateEvent_ = nullptr; + Metric speed_ = {1.0, 0, nullptr}; }; /********** @@ -159,35 +144,34 @@ public: **********/ /** @ingroup SURF_cpu_interface - * @brief SURF Cpu action interface class - * @details A CpuAction represent the execution of code on a Cpu - */ -XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action { -friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); -public: -/** @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 previous)` + * @brief A CpuAction represents the execution of code on one or several Cpus */ - static simgrid::xbt::signal onStateChange; +class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::Action { + friend XBT_PUBLIC Cpu* getActionCpu(CpuAction * action); - /** @brief CpuAction constructor */ - CpuAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:DEADCODE? - - /** @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] +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)` */ - virtual void setAffinity(Cpu *cpu, unsigned long mask); + static simgrid::xbt::signal onShareChange; - void setState(e_surf_action_state_t state); + 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 updateRemainingLazy(double now); + void set_state(simgrid::kernel::resource::Action::State state) override; + void update_remains_lazy(double now) override; + std::list cpus(); + + void suspend() override; + void resume() override; }; }