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
Compile trace_mgr with g++. Next step: objectification
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
306312d
..
6a1d618
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-5,8
+5,9
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_ti.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_ti.hpp"
-#include "trace_mgr_private.h"
#include "xbt/heap.h"
#include "xbt/heap.h"
+#include "src/surf/trace_mgr.hpp"
+#include "src/surf/platform.hpp"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
@@
-390,7
+391,9
@@
int CpuTiTrace::binarySearch(double *array, double a, int low, int high)
static void cpu_ti_define_callbacks()
{
static void cpu_ti_define_callbacks()
{
- sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
/*********
}
/*********
@@
-585,7
+588,7
@@
CpuTi::~CpuTi()
delete p_actionSet;
}
delete p_actionSet;
}
-void CpuTi::updateState(tmgr_trace_
event
_t event_type,
+void CpuTi::updateState(tmgr_trace_
iterator
_t event_type,
double value, double date)
{
CpuTiAction *action;
double value, double date)
{
CpuTiAction *action;