X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/290e19f26b10dc49485d7d7b06859edff32fd1e1..2b7f31c28960f312a8c7eb09f7e80adae1502401:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index de6859aae9..e5c82bdc77 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,45 +14,38 @@ * Classes * ***********/ class CpuModel; -typedef CpuModel *CpuModelPtr; - class Cpu; -typedef Cpu *CpuPtr; - class CpuAction; -typedef CpuAction *CpuActionPtr; - class CpuPlugin; -typedef CpuPlugin *CpuPluginPtr; /************* * Callbacks * *************/ -XBT_PUBLIC(CpuPtr) getActionCpu(CpuActionPtr action); +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, CpuPtr)) cpuCreatedCallbacks; +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, CpuPtr)) cpuDestructedCallbacks; +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(CpuActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` + * @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, CpuPtr, e_surf_resource_state_t, e_surf_resource_state_t)) cpuStateChangedCallbacks; +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(CpuActionPtr action, e_surf_action_state_t old, e_surf_action_state_t current)` + * @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, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks; XBT_PUBLIC(void) cpu_parse_init(sg_platf_host_cbarg_t host); @@ -68,12 +61,8 @@ XBT_PUBLIC(void) cpu_add_traces(); */ XBT_PUBLIC_CLASS CpuModel : public Model { public: - /** - * @brief CpuModel constructor - * - * @param name The name of the model - */ - CpuModel(const char *name) : Model(name) {}; + /** @brief Constructor */ + CpuModel() : Model() {}; /** * @brief Create a Cpu @@ -88,7 +77,7 @@ public: * @param state_trace [TODO] * @param cpu_properties Dictionary of properties associated to this Cpu */ - virtual CpuPtr createCpu(const char *name, xbt_dynar_t power_peak, + virtual Cpu *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, @@ -97,6 +86,7 @@ public: void updateActionsStateLazy(double now, double delta); void updateActionsStateFull(double now, double delta); + bool shareResourcesIsIdempotent() {return true;} }; /************ @@ -105,7 +95,7 @@ public: /** @ingroup SURF_cpu_interface * @brief SURF cpu resource interface class -* @details A Cpu represent a cpu associated to a workstation +* @details A Cpu represent a cpu associated to a host */ XBT_PUBLIC_CLASS Cpu : public Resource { public: @@ -125,7 +115,7 @@ public: * @param powerPeak The power peak of this Cpu * @param powerScale The power scale of this Cpu */ - Cpu(ModelPtr model, const char *name, xbt_dict_t props, + Cpu(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, int core, double powerPeak, double powerScale); /** @@ -138,7 +128,7 @@ public: * @param powerPeak The power peak of this Cpu in [TODO] * @param powerScale The power scale of this Cpu in [TODO] */ - Cpu(ModelPtr model, const char *name, xbt_dict_t props, + Cpu(Model *model, const char *name, xbt_dict_t props, int core, double powerPeak, double powerScale); /** @@ -152,7 +142,7 @@ public: * @param size The value of the processing amount (in flop) needed to process * @return The CpuAction corresponding to the processing */ - virtual CpuActionPtr execute(double size)=0; + virtual CpuAction *execute(double size)=0; /** * @brief Make a process sleep for duration (in seconds) @@ -160,7 +150,7 @@ public: * @param duration The number of seconds to sleep * @return The CpuAction corresponding to the sleeping */ - virtual CpuActionPtr sleep(double duration)=0; + virtual CpuAction *sleep(double duration)=0; /** * @brief Get the number of cores of the current Cpu @@ -212,6 +202,33 @@ public: /* Note (hypervisor): */ lmm_constraint_t *p_constraintCore; void **p_constraintCoreId; + + // //// + // Adrien - Oct 2015. Additional code related to VM energy extensions + /* TODO: + 1./ create a VirtualCpuModel that inherits from CpuModel or create + a VirtualCpuCas01Model that inherit from CpuCas01Model + => Question: not sure which one is really useful :( The objective is to + be able to create a VirtualCpu instead of a Cpu (i.e. a CpuCas01 to be exact). + 2. create VirtualCpu class that inherits from Cpu or create + a VirtualCpuCas01 class that inherits from CpuCas01 (same issue as the one described above). + Such modifications would enable us to remove the isVirtual method and + actually use the polymorphism feature of C++. It will also enable us + to overwrite the cpu_energy hashmap in energyCpuCreateCallBack instead of invoking + setVirtual(). + So to make a long story short, it will be cleaner from the software viewpoint + and patches welcome ;) - Adrien October 20 2015 + */ + Cpu *physCpu = NULL; + + /** @brief Specify the physical CPU of the current CPU (which is a vCPU) */ + void setPhysicalCPU(Cpu *physCpu); + + /** @brief Get the physical if the current one is a vCPU, or NULL if it's already a physical CPU */ + Cpu* getPhysicalCPU(void); + + // Adrien - Oct 2015. End of additional code related to VM energy extensions + // //// }; /********** @@ -223,7 +240,7 @@ public: * @details A CpuAction represent the execution of code on a Cpu */ XBT_PUBLIC_CLASS CpuAction : public Action { -friend CpuPtr getActionCpu(CpuActionPtr action); +friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); public: /** * @brief CpuAction constructor @@ -232,7 +249,7 @@ public: * @param cost [TODO] * @param failed [TODO] */ - CpuAction(ModelPtr model, double cost, bool failed) + CpuAction(Model *model, double cost, bool failed) : Action(model, cost, failed) {} //FIXME:REMOVE /** @@ -243,7 +260,7 @@ public: * @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) + CpuAction(Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {} /** @@ -253,7 +270,7 @@ public: * @param cpu [TODO] * @param mask [TODO] */ - virtual void setAffinity(CpuPtr cpu, unsigned long mask); + virtual void setAffinity(Cpu *cpu, unsigned long mask); void setState(e_surf_action_state_t state);