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
Rename sg_platf_new_AS_{open,close} to {begin,end} since you cannot reopen them to...
[simgrid.git]
/
src
/
surf
/
cpu_ti.c
diff --git
a/src/surf/cpu_ti.c
b/src/surf/cpu_ti.c
index
7c1a1a6
..
ab3bad8
100644
(file)
--- a/
src/surf/cpu_ti.c
+++ b/
src/surf/cpu_ti.c
@@
-14,6
+14,7
@@
#include "trace_mgr_private.h"
#include "cpu_ti_private.h"
#include "xbt/heap.h"
#include "trace_mgr_private.h"
#include "cpu_ti_private.h"
#include "xbt/heap.h"
+#include "surf/surf_resource.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_ti, surf,
"Logging specific to the SURF CPU TRACE INTEGRATION module");
@@
-49,10
+50,8
@@
static int surf_cpu_ti_binary_search(double *array, double a, int low,
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
- if (trace->time_points)
- xbt_free(trace->time_points);
- if (trace->integral)
- xbt_free(trace->integral);
+ xbt_free(trace->time_points);
+ xbt_free(trace->integral);
xbt_free(trace);
}
xbt_free(trace);
}
@@
-192,13
+191,13
@@
static void* cpu_ti_create_resource(const char *name, double power_peak,
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
{
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
{
- cpu_ti_create_resource(host->
V_host_
id,
- host->
V_host_
power_peak,
- host->
V_host_
power_scale,
- host->
V_host_
power_trace,
- host->
V_host_core
,
- host->
V_host_state_initial
,
- host->
V_host_
state_trace,
+ cpu_ti_create_resource(host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->
core_amount
,
+ host->
initial_state
,
+ host->state_trace,
host->properties);
}
host->properties);
}
@@
-263,7
+262,7
@@
static void add_traces_cpu_ti(void)
static void cpu_ti_define_callbacks()
{
sg_platf_host_add_cb(parse_cpu_ti_init);
static void cpu_ti_define_callbacks()
{
sg_platf_host_add_cb(parse_cpu_ti_init);
- s
urfxml_add_callback(ETag_surfxml_platform_cb_list, &
add_traces_cpu_ti);
+ s
g_platf_postparse_add_cb(
add_traces_cpu_ti);
}
static int cpu_ti_resource_used(void *resource_id)
}
static int cpu_ti_resource_used(void *resource_id)