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
Revert "Quick fix for warnings in compilation induced by fat trees."
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
752754a
..
1361b0e
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-50,7
+50,7
@@
private:
};
enum trace_type {
};
enum trace_type {
-
+
TRACE_FIXED, /*< Trace fixed, no availability file */
TRACE_DYNAMIC /*< Dynamic, availability file disponible */
};
TRACE_FIXED, /*< Trace fixed, no availability file */
TRACE_DYNAMIC /*< Dynamic, availability file disponible */
};
@@
-86,7
+86,7
@@
public:
~CpuTiModel();
void parseInit(sg_platf_host_cbarg_t host);
~CpuTiModel();
void parseInit(sg_platf_host_cbarg_t host);
- Cpu
Ti
Ptr createResource(const char *name, xbt_dynar_t powerPeak,
+ CpuPtr createResource(const char *name, xbt_dynar_t powerPeak,
int pstate, double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
int pstate, double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
@@
-121,7
+121,7
@@
public:
xbt_dict_t properties) ;
~CpuTi();
xbt_dict_t properties) ;
~CpuTi();
- void updateState(tmgr_trace_event_t event_type, double value, double date);
+ void updateState(tmgr_trace_event_t event_type, double value, double date);
void updateActionsFinishTime(double now);
bool isUsed();
void printCpuTiModel();
void updateActionsFinishTime(double now);
bool isUsed();
void printCpuTiModel();