X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8b0c2495697cb3be4ea22a4b356e92d118e5a82..7263d4ee073e1ff17648971a077f7057ce2f4076:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 385164f704..fc67386f29 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,57 +1,26 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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/s4u/Host.hpp" +#include "src/surf/maxmin_private.hpp" + +#include + /*********** * Classes * ***********/ + +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 Cpu creation * - * @details Callback functions have the following signature: `void(CpuPtr)` - */ -XBT_PUBLIC_DATA( surf_callback(void, Cpu*)) cpuCreatedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after Cpu destruction * - * @details Callback functions have the following signature: `void(CpuPtr)` - */ -XBT_PUBLIC_DATA( surf_callback(void, Cpu*)) cpuDestructedCallbacks; - -/** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after Cpu State changed * - * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_resource_state_t old, e_surf_resource_state_t current)` - */ -XBT_PUBLIC_DATA( surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t)) cpuStateChangedCallbacks; - -/** @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( surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks; - -XBT_PUBLIC(void) cpu_add_traces(); - -/********* - * Model * - *********/ /** @ingroup SURF_cpu_interface * @brief SURF cpu model interface class @@ -59,31 +28,17 @@ XBT_PUBLIC(void) cpu_add_traces(); */ XBT_PUBLIC_CLASS CpuModel : public Model { public: - CpuModel() : Model() {}; - /** * @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] - * @param cpu_properties Dictionary of properties associated to this Cpu */ - 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, - xbt_dict_t cpu_properties)=0; - - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - bool shareResourcesIsIdempotent() {return true;} + virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core)=0; + + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; }; /************ @@ -94,43 +49,29 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public Resource { +XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { public: - Cpu(); - /** * @brief Cpu constructor * * @param model The CpuModel associated to this Cpu - * @param name The name of the Cpu - * @param props Dictionary of properties 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 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 - * @param speedScale The speed scale of this Cpu */ - Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double speedPeak, double speedScale, - e_surf_resource_state_t stateInitial); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t 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 props Dictionary of properties associated to this 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) */ - Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double speedPeak, double speedScale, - e_surf_resource_state_t stateInitial); - - Cpu(Model *model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double speedPeak, double speedScale); - Cpu(Model *model, const char *name, xbt_dict_t props, - int core, double speedPeak, double speedScale); + Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); ~Cpu(); @@ -140,7 +81,20 @@ public: * @param size The value of the processing amount (in flop) needed to process * @return The CpuAction corresponding to the processing */ - virtual Action *execute(double size)=0; + virtual simgrid::surf::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::surf::Action* execution_start(double size, int requestedCores) + { + THROW_UNIMPLEMENTED; + return nullptr; + } /** * @brief Make a process sleep for duration (in seconds) @@ -148,36 +102,42 @@ public: * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ - virtual Action *sleep(double duration)=0; + virtual simgrid::surf::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); +protected: + /** @brief Take speed changes (either load or max) into account */ + virtual void onSpeedChange(); + +public: /** @brief Get the available speed of the current Cpu */ virtual double getAvailableSpeed(); - /** @brief Get the current Cpu power peak */ - virtual double getCurrentPowerPeak(); + /** @brief Get the current Cpu computational speed */ + virtual double getPstateSpeed(int pstate_index); + + virtual int getNbPStates(); + virtual void setPState(int pstate_index); + virtual int getPState(); - virtual double getPowerPeakAt(int pstate_index)=0; + simgrid::s4u::Host* getHost() { return host_; } - virtual int getNbPstates()=0; - virtual void setPstate(int pstate_index)=0; - virtual int getPstate()=0; + int coresAmount_ = 1; + simgrid::s4u::Host* host_; - void setState(e_surf_resource_state_t state); + std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ + int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ - void addTraces(void); - 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] */ + 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) */ - /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore; - void **p_constraintCoreId; + tmgr_trace_event_t stateEvent_ = nullptr; + s_surf_metric_t speed_ = {1.0, 0, nullptr}; }; /********** @@ -185,30 +145,35 @@ 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 Action { +XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action { friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); public: - /** @brief CpuAction constructor */ - CpuAction(Model *model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:REMOVE - - /** @brief CpuAction constructor */ - CpuAction(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] - */ - virtual void setAffinity(Cpu *cpu, unsigned long mask); +/** @brief Signal emitted when the action state changes (ready/running/done, etc) + * Signature: `void(CpuAction *action, simgrid::surf::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; - void setState(e_surf_action_state_t state); + CpuAction(simgrid::surf::Model *model, double cost, bool failed) + : Action(model, cost, failed) {} + CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) + : Action(model, cost, failed, var) {} - void updateRemainingLazy(double now); + void setState(simgrid::surf::Action::State state) override; + void updateRemainingLazy(double now) override; + std::list cpus(); + + void suspend() override; + void resume() override; }; +} +} + #endif /* SURF_CPU_INTERFACE_HPP_ */