A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
translate a comment
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
7e2c9cd
..
7cdd244
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
3
. The SimGrid Team.
+/* Copyright (c) 2004-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-14,39
+14,42
@@
* Classes *
***********/
class CpuModel;
* Classes *
***********/
class CpuModel;
-typedef CpuModel *CpuModelPtr;
-
class Cpu;
class Cpu;
-typedef Cpu *CpuPtr;
-
class CpuAction;
class CpuAction;
-typedef CpuAction *CpuActionPtr;
-
class CpuPlugin;
class CpuPlugin;
-typedef CpuPlugin *CpuPluginPtr;
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
-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, Cpu*)) cpuCreatedCallbacks;
/** @ingroup SURF_callbacks
/** @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
destruction *
+ * @detail
s
Callback functions have the following signature: `void(CpuPtr)`
*/
*/
-
extern surf_callback(void, CpuPtr) createCpu
Callbacks;
+
XBT_PUBLIC_DATA( surf_callback(void, Cpu*)) cpuDestructed
Callbacks;
/** @ingroup SURF_callbacks
/** @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
State changed *
+ * @detail
s 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) deleteCpu
Callbacks;
+
XBT_PUBLIC_DATA( surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t)) cpuStateChanged
Callbacks;
/** @ingroup SURF_callbacks
/** @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 CpuAction
State changed *
+ * @detail
s 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) updateCpuActionCallbacks;
+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 *
/*********
* Model *
@@
-56,29
+59,34
@@
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
*/
* @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:
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
/**
* @brief Create a Cpu
- *
+ *
* @param name The name of the 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 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);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
-
- virtual void addTraces() =0;
+ bool shareResourcesIsIdempotent() {return true;}
};
/************
};
/************
@@
-87,9
+95,9
@@
public:
/** @ingroup SURF_cpu_interface
* @brief SURF cpu resource interface class
/** @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
public:
/**
* @brief Cpu constructor
@@
-98,7
+106,7
@@
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 model The CpuModel associated to this Cpu
* @param name The name of the Cpu
* @param props Dictionary of properties associated to this Cpu
@@
-107,12
+115,12
@@
public:
* @param powerPeak The power peak of this Cpu
* @param powerScale The power scale of this Cpu
*/
* @param powerPeak The power peak of this Cpu
* @param powerScale The power scale of this Cpu
*/
- Cpu(Model
Ptr
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
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 model The CpuModel associated to this Cpu
* @param name The name of the Cpu
* @param props Dictionary of properties associated to this Cpu
@@
-120,33
+128,33
@@
public:
* @param powerPeak The power peak of this Cpu in [TODO]
* @param powerScale The power scale of this Cpu in [TODO]
*/
* @param powerPeak The power peak of this Cpu in [TODO]
* @param powerScale The power scale of this Cpu in [TODO]
*/
- Cpu(Model
Ptr
model, const char *name, xbt_dict_t props,
+ Cpu(Model
*
model, const char *name, xbt_dict_t props,
int core, double powerPeak, double powerScale);
/**
int core, double powerPeak, double powerScale);
/**
- * @brie
a
f Cpu destructor
+ * @brief Cpu destructor
*/
~Cpu();
/**
* @brief Execute some quantity of computation
*/
~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
*/
* @param size The value of the processing amount (in flop) needed to process
* @return The CpuAction corresponding to the processing
*/
- virtual CpuAction
Ptr
execute(double size)=0;
+ virtual CpuAction
*
execute(double size)=0;
/**
* @brief Make a process sleep for duration (in seconds)
/**
* @brief Make a process sleep for duration (in seconds)
- *
+ *
* @param duration The number of seconds to sleep
* @return The CpuAction corresponding to the sleeping
*/
* @param duration The number of seconds to sleep
* @return The CpuAction corresponding to the sleeping
*/
- virtual CpuAction
Ptr
sleep(double duration)=0;
+ virtual CpuAction
*
sleep(double duration)=0;
/**
* @brief Get the number of cores of the current Cpu
/**
* @brief Get the number of cores of the current Cpu
- *
+ *
* @return The number of cores of the current Cpu
*/
virtual int getCore();
* @return The number of cores of the current Cpu
*/
virtual int getCore();
@@
-154,9
+162,9
@@
public:
/**
* @brief Get the speed of the current Cpu
* @details [TODO] load * m_powerPeak
/**
* @brief Get the speed of the current Cpu
* @details [TODO] load * m_powerPeak
- *
+ *
* @param load [TODO]
* @param load [TODO]
- *
+ *
* @return The speed of the current Cpu
*/
virtual double getSpeed(double load);
* @return The speed of the current Cpu
*/
virtual double getSpeed(double load);
@@
-164,29
+172,32
@@
public:
/**
* @brief Get the available speed of the current Cpu
* @details [TODO]
/**
* @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 available speed of the current Cpu
*/
virtual double getAvailableSpeed();
/**
* @brief Get the current Cpu power peak
- *
+ *
* @return 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 double getPowerPeakAt(int pstate_index)=0;
-
+
virtual int getNbPstates()=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);
void addTraces(void);
int m_core;
double m_powerPeak; /*< CPU power peak */
void addTraces(void);
int m_core;
double m_powerPeak; /*< CPU power peak */
- double m_powerScale; /*< Percentage of CPU
disponi
ble */
+ double m_powerScale; /*< Percentage of CPU
availa
ble */
/* Note (hypervisor): */
lmm_constraint_t *p_constraintCore;
/* Note (hypervisor): */
lmm_constraint_t *p_constraintCore;
@@
-201,54
+212,43
@@
public:
* @brief SURF Cpu action interface class
* @details A CpuAction represent the execution of code on a Cpu
*/
* @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
public:
/**
* @brief CpuAction constructor
- */
- CpuAction(){};
-
- /**
- * @brief CpuAction constructor
- *
+ *
* @param model The CpuModel associated to this CpuAction
* @param cost [TODO]
* @param failed [TODO]
*/
* @param model The CpuModel associated to this CpuAction
* @param cost [TODO]
* @param failed [TODO]
*/
- CpuAction(Model
Ptr
model, double cost, bool failed)
- : Action(model, cost, failed) {} //FIXME:REMOVE
+ CpuAction(Model
*
model, double cost, bool failed)
+
: Action(model, cost, failed) {} //FIXME:REMOVE
/**
* @brief CpuAction constructor
/**
* @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
*/
* @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(Model
Ptr
model, double cost, bool failed, lmm_variable_t var)
- : Action(model, cost, failed, 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]
/**
* @brief Set the affinity of the current CpuAction
* @details [TODO]
- *
+ *
* @param cpu [TODO]
* @param cpu [TODO]
- * @param
long
[TODO]
+ * @param
mask
[TODO]
*/
*/
- virtual void setAffinity(Cpu
Ptr
cpu, unsigned long mask);
+ virtual void setAffinity(Cpu
*
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);
void updateRemainingLazy(double now);
- double m_bound;
+
};
#endif /* SURF_CPU_INTERFACE_HPP_ */
};
#endif /* SURF_CPU_INTERFACE_HPP_ */