-/* 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
* Classes *
***********/
class CpuModel;
-typedef CpuModel *CpuModelPtr;
-
class Cpu;
-typedef Cpu *CpuPtr;
-
class CpuAction;
-typedef CpuAction *CpuActionPtr;
-
class CpuPlugin;
-typedef CpuPlugin *CpuPluginPtr;
/*************
* Callbacks *
*************/
-CpuPtr getActionCpu(CpuActionPtr action);
+XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after Cpu creation *
+ * @brief Callbacks handler which emit the callbacks after Cpu creation *
* @details Callback functions have the following signature: `void(CpuPtr)`
*/
-extern 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 *
+ * @brief Callbacks handler which emit the callbacks after Cpu destruction *
* @details Callback functions have the following signature: `void(CpuPtr)`
*/
-extern 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)`
+ * @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)`
*/
-extern surf_callback(void, CpuPtr) 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)`
+ * @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)`
*/
-extern surf_callback(void, CpuActionPtr) 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);
+
+XBT_PUBLIC(void) cpu_add_traces();
/*********
* Model *
* @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 Constructor */
+ CpuModel() : Model() {};
/**
* @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);
-
- void setState(e_surf_resource_state_t state);
+ 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,
+ 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;
+ bool shareResourcesIsIdempotent() {return true;}
};
/************
/** @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
*/
-class Cpu : public Resource {
+XBT_PUBLIC_CLASS Cpu : public Resource {
public:
/**
* @brief Cpu constructor
/**
* @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 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);
/**
* @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 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);
/**
/**
* @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 CpuActionPtr execute(double size)=0;
+ virtual CpuAction *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 CpuActionPtr sleep(double duration)=0;
+ virtual CpuAction *sleep(double duration)=0;
/**
* @brief Get the number of cores of the current Cpu
- *
+ *
* @return The number of cores of the current Cpu
*/
virtual int getCore();
/**
* @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);
/**
* @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;
+
+ virtual void setPstate(int pstate_index)=0;
+ virtual int getPstate()=0;
void setState(e_surf_resource_state_t state);
/* 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 inherist from CpuCas01Model
+ => Question: not sure which one is really usefull :( 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 Set the current Cpu as virtual or physical
+ *
+ * @param isVirtual true to indicate this Cpu is virtual, false otherwise
+ */
+ void setVirtual(Cpu *physCpu);
+
+ /**
+ * @brief Learn if this Cpu is physical or virtual
+ *
+ * @return phys CPU if the current Cpu is a VM, null otherwise
+ */
+ Cpu* isVirtual(void);
+
+ // Adrien - Oct 2015. End of additional code related to VM energy extensions
+ // ////
};
/**********
* @brief SURF Cpu action interface class
* @details A CpuAction represent the execution of code on a Cpu
*/
-class CpuAction : public Action {
-friend CpuPtr getActionCpu(CpuActionPtr action);
+XBT_PUBLIC_CLASS CpuAction : public Action {
+friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *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)
+ CpuAction(Model *model, double cost, bool failed)
: 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)
+ 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]
- *
+ *
* @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);