X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1137465cab98cdaa8b0364e533fc82d9b7b0cdc..8dadf249202bc6834a1d680b8ec8446937b3c4a6:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 852d71c3a4..2cb2d53843 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2004-2015. 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" @@ -7,88 +13,198 @@ /*********** * Classes * ***********/ -class CpuModel; -typedef CpuModel *CpuModelPtr; -class Cpu; -typedef Cpu *CpuPtr; +namespace simgrid { +namespace surf { +class CpuModel; +class Cpu; class CpuAction; -typedef CpuAction *CpuActionPtr; - class CpuPlugin; -typedef CpuPlugin *CpuPluginPtr; /************* * Callbacks * *************/ -CpuPtr getActionCpu(CpuActionPtr action); +XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); -extern surf_callback(void, CpuPtr) createCpuCallbacks; -extern surf_callback(void, CpuPtr) deleteCpuCallbacks; -extern surf_callback(void, CpuActionPtr) updateCpuActionCallbacks; +XBT_PUBLIC(void) cpu_add_traces(); /********* * Model * *********/ -class CpuModel : public 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 { public: - CpuModel(const char *name) : Model(name) {}; - CpuPtr createResource(string name); + 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 core The number of core of this Cpu + * @param state_initial [TODO] + * @param state_trace [TODO] + */ + virtual Cpu *createCpu(simgrid::Host *host, 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)=0; + void updateActionsStateLazy(double now, double delta); void updateActionsStateFull(double now, double delta); - - virtual void addTraces() =0; + bool shareResourcesIsIdempotent() {return true;} }; /************ * Resource * ************/ -class Cpu : public Resource { + +/** @ingroup SURF_cpu_interface +* @brief SURF cpu resource interface class +* @details A Cpu represent a cpu associated to a host +*/ +XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { public: - Cpu(){surf_callback_emit(createCpuCallbacks, this);}; - Cpu(ModelPtr model, const char *name, xbt_dict_t props, - lmm_constraint_t constraint, int core, double powerPeak, double powerScale); - Cpu(ModelPtr model, const char *name, xbt_dict_t props, - int core, double powerPeak, double powerScale); + Cpu(); + + /** + * @brief Cpu constructor + * + * @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 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) + * @param stateInitial whether it is created running or crashed + */ + Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale, + e_surf_resource_state_t stateInitial); + + /** + * @brief Cpu constructor + * + * @param model The CpuModel associated to this Cpu + * @param host The host in which this Cpu should be plugged + * @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) + * @param stateInitial whether it is created running or crashed + */ + Cpu(simgrid::surf::Model *model, simgrid::Host *host, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale, + e_surf_resource_state_t stateInitial); + + Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale); + Cpu(simgrid::surf::Model *model, simgrid::Host *host, + xbt_dynar_t speedPeakList, int pstate, + int core, double speedPeak, double speedScale); + ~Cpu(); - virtual CpuActionPtr execute(double size)=0; - virtual CpuActionPtr sleep(double duration)=0; + + /** + * @brief Execute some quantity of computation + * + * @param size The value of the processing amount (in flop) needed to process + * @return The CpuAction corresponding to the processing + */ + virtual simgrid::surf::Action *execute(double size)=0; + + /** + * @brief Make a process sleep for duration (in seconds) + * + * @param duration The number of seconds to sleep + * @return The CpuAction corresponding to the sleeping + */ + virtual simgrid::surf::Action *sleep(double duration)=0; + + /** @brief Get the amount of cores */ virtual int getCore(); + + /** @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 the available speed of the current Cpu */ virtual double getAvailableSpeed(); - virtual double getCurrentPowerPeak()=0; - virtual double getPowerPeakAt(int pstate_index)=0; - virtual int getNbPstates()=0; - virtual void setPowerPeakAt(int pstate_index)=0; + /** @brief Get the current Cpu power peak */ + virtual double getCurrentPowerPeak(); + + virtual double getPowerPeakAt(int pstate_index); + + virtual int getNbPStates(); + virtual void setPState(int pstate_index); + virtual int getPState(); void addTraces(void); - int m_core; - double m_powerPeak; /*< CPU power peak */ - double m_powerScale; /*< Percentage of CPU disponible */ + simgrid::Host* getHost() { return m_host; } + +public: + 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] */ + simgrid::Host* m_host; + + xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */ + int m_pstate = 0; /*< Current pstate (index in the speedPeakList)*/ /* Note (hypervisor): */ - lmm_constraint_t *p_constraintCore; - void **p_constraintCoreId; + lmm_constraint_t *p_constraintCore=NULL; + void **p_constraintCoreId=NULL; + }; /********** * Action * **********/ -class CpuAction : public Action { -friend CpuPtr getActionCpu(CpuActionPtr action); + + /** @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: - CpuAction(){}; - CpuAction(ModelPtr model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:REMOVE - CpuAction(ModelPtr model, double cost, bool failed, lmm_variable_t var) - : Action(model, cost, failed, var) {} - virtual void setAffinity(CpuPtr cpu, unsigned long mask); - virtual void setBound(double bound); +/** @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)` + */ + static simgrid::surf::signal onStateChange; + + /** @brief CpuAction constructor */ + CpuAction(simgrid::surf::Model *model, double cost, bool failed) + : Action(model, cost, failed) {} //FIXME:REMOVE + + /** @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] + */ + virtual void setAffinity(Cpu *cpu, unsigned long mask); + + void setState(e_surf_action_state_t state); void updateRemainingLazy(double now); - double m_bound; + }; +} +} + #endif /* SURF_CPU_INTERFACE_HPP_ */