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
[Fat Trees] Function generating dot files should be working,
[simgrid.git]
/
src
/
surf
/
cpu_interface.hpp
diff --git
a/src/surf/cpu_interface.hpp
b/src/surf/cpu_interface.hpp
index
f8b88a4
..
b2f4e8a
100644
(file)
--- a/
src/surf/cpu_interface.hpp
+++ b/
src/surf/cpu_interface.hpp
@@
-54,9
+54,9
@@
XBT_PUBLIC_DATA( surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_res
*/
XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
*/
XBT_PUBLIC_DATA( surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t)) cpuActionStateChangedCallbacks;
-
void
parse_cpu_init(sg_platf_host_cbarg_t host);
+
XBT_PUBLIC(void)
parse_cpu_init(sg_platf_host_cbarg_t host);
-
void
add_traces_cpu();
+
XBT_PUBLIC(void)
add_traces_cpu();
/*********
* Model *
/*********
* Model *
@@
-66,7
+66,7
@@
void add_traces_cpu();
* @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:
/**
* @brief CpuModel constructor
public:
/**
* @brief CpuModel constructor
@@
-88,7
+88,6
@@
public:
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)=0;
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)=0;
- void setState(e_surf_resource_state_t state);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
void updateActionsStateLazy(double now, double delta);
void updateActionsStateFull(double now, double delta);
@@
-104,7
+103,7
@@
public:
* @brief SURF cpu resource interface class
* @details A Cpu represent a cpu associated to a workstation
*/
* @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
public:
/**
* @brief Cpu constructor
@@
-189,7
+188,7
@@
public:
*
* @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;
@@
-218,7
+217,7
@@
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 {
+
XBT_PUBLIC_CLASS
CpuAction : public Action {
friend CpuPtr getActionCpu(CpuActionPtr action);
public:
/**
friend CpuPtr getActionCpu(CpuActionPtr action);
public:
/**