X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad2e588c6af6cf84b18ba7c1c96f4f9785d93c28..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 7e2c9cda37..c4bc20c5bf 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2013. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -28,25 +28,35 @@ typedef CpuPlugin *CpuPluginPtr; /************* * Callbacks * *************/ -CpuPtr getActionCpu(CpuActionPtr action); +XBT_PUBLIC(CpuPtr) getActionCpu(CpuActionPtr action); /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after Cpu creation * - * @detail Callback functions have the following signature: `void(CpuPtr)` + * @brief Callbacks handler which emit the callbacks after Cpu creation * + * @details Callback functions have the following signature: `void(CpuPtr)` */ -extern surf_callback(void, CpuPtr) createCpuCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, CpuPtr)) cpuCreatedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after Cpu destruction * - * @detail Callback functions have the following signature: `void(CpuPtr)` + * @brief Callbacks handler which emit the callbacks after Cpu destruction * + * @details Callback functions have the following signature: `void(CpuPtr)` */ -extern surf_callback(void, CpuPtr) deleteCpuCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, CpuPtr)) cpuDestructedCallbacks; /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after CpuAction update * - * @detail Callback functions have the following signature: `void(CpuActionPtr)` + * @brief Callbacks handler which emit the callbacks after Cpu State changed * + * @details Callback functions have the following signature: `void(CpuActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` */ -extern surf_callback(void, CpuActionPtr) updateCpuActionCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, CpuPtr, 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(CpuActionPtr action, e_surf_action_state_t old, e_surf_action_state_t current)` + */ +XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks; + +XBT_PUBLIC(void) cpu_parse_init(sg_platf_host_cbarg_t host); + +XBT_PUBLIC(void) cpu_add_traces(); /********* * Model * @@ -56,29 +66,37 @@ extern surf_callback(void, CpuActionPtr) updateCpuActionCallbacks; * @brief SURF cpu model interface class * @details A model is an object which handle the interactions between its Resources and its Actions */ -class CpuModel : public Model { +XBT_PUBLIC_CLASS CpuModel : public Model { public: /** * @brief CpuModel constructor - * + * * @param name The name of the model */ CpuModel(const char *name) : Model(name) {}; /** * @brief Create a Cpu - * + * * @param name The name of the Cpu - * - * @return The created Cpu + * @param power_peak The power peak of this Cpu + * @param pstate [TODO] + * @param power_scale The power scale of this Cpu + * @param power_trace [TODO] + * @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 */ - CpuPtr createResource(string name); - + virtual CpuPtr createCpu(const char *name, xbt_dynar_t power_peak, + int pstate, double power_scale, + tmgr_trace_t power_trace, 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); - - virtual void addTraces() =0; }; /************ @@ -89,7 +107,7 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a workstation */ -class Cpu : public Resource { +XBT_PUBLIC_CLASS Cpu : public Resource { public: /** * @brief Cpu constructor @@ -98,7 +116,7 @@ public: /** * @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 @@ -112,7 +130,7 @@ public: /** * @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 @@ -124,13 +142,13 @@ public: int core, double powerPeak, double powerScale); /** - * @brieaf Cpu destructor + * @brief Cpu destructor */ ~Cpu(); /** * @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 */ @@ -138,7 +156,7 @@ public: /** * @brief Make a process sleep for duration (in seconds) - * + * * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ @@ -146,7 +164,7 @@ public: /** * @brief Get the number of cores of the current Cpu - * + * * @return The number of cores of the current Cpu */ virtual int getCore(); @@ -154,9 +172,9 @@ public: /** * @brief Get the speed of the current Cpu * @details [TODO] load * m_powerPeak - * + * * @param load [TODO] - * + * * @return The speed of the current Cpu */ virtual double getSpeed(double load); @@ -164,25 +182,27 @@ public: /** * @brief Get the available speed of the current Cpu * @details [TODO] - * + * * @return The available speed of the current Cpu */ virtual double getAvailableSpeed(); /** * @brief Get the current Cpu power peak - * + * * @return The current Cpu power peak */ - virtual double getCurrentPowerPeak()=0; + virtual double getCurrentPowerPeak(); virtual double getPowerPeakAt(int pstate_index)=0; - + virtual int getNbPstates()=0; - + virtual void setPowerPeakAt(int pstate_index)=0; + void setState(e_surf_resource_state_t state); + void addTraces(void); int m_core; double m_powerPeak; /*< CPU power peak */ @@ -201,54 +221,43 @@ public: * @brief SURF Cpu action interface class * @details A CpuAction represent the execution of code on a Cpu */ -class CpuAction : public Action { +XBT_PUBLIC_CLASS CpuAction : public Action { friend CpuPtr getActionCpu(CpuActionPtr action); public: /** * @brief CpuAction constructor - */ - CpuAction(){}; - - /** - * @brief CpuAction constructor - * + * * @param model The CpuModel associated to this CpuAction * @param cost [TODO] * @param failed [TODO] */ CpuAction(ModelPtr model, double cost, bool failed) - : Action(model, cost, failed) {} //FIXME:REMOVE + : Action(model, cost, failed) {} //FIXME:REMOVE /** * @brief CpuAction constructor - * + * * @param model The CpuModel associated to this CpuAction * @param cost [TODO] * @param failed [TODO] * @param var The lmm variable associated to this CpuAction if it is part of a LMM component */ CpuAction(ModelPtr model, double cost, bool failed, lmm_variable_t var) - : Action(model, cost, failed, var) {} + : Action(model, cost, failed, var) {} /** * @brief Set the affinity of the current CpuAction * @details [TODO] - * + * * @param cpu [TODO] - * @param long [TODO] + * @param mask [TODO] */ virtual void setAffinity(CpuPtr cpu, unsigned long mask); - /** - * @brief Set the bound of current CpuAction - * @details [TODO] - * - * @param bound [TODO] - */ - virtual void setBound(double bound); + void setState(e_surf_action_state_t state); void updateRemainingLazy(double now); - double m_bound; + }; #endif /* SURF_CPU_INTERFACE_HPP_ */