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
Merge branch 'master' into MC_LTL
[simgrid.git]
/
src
/
surf
/
workstation_ptask_L07.c
diff --git
a/src/surf/workstation_ptask_L07.c
b/src/surf/workstation_ptask_L07.c
index
ce71a99
..
b8ecc23
100644
(file)
--- a/
src/surf/workstation_ptask_L07.c
+++ b/
src/surf/workstation_ptask_L07.c
@@
-26,8
+26,8
@@
typedef struct cpu_L07 {
double power_scale;
double power_current;
tmgr_trace_event_t power_event;
double power_scale;
double power_current;
tmgr_trace_event_t power_event;
- e_surf_resource_state_t state_current;
tmgr_trace_event_t state_event;
tmgr_trace_event_t state_event;
+ e_surf_resource_state_t state_current;
int id; /* cpu and network card are a single object... */
} s_cpu_L07_t, *cpu_L07_t;
int id; /* cpu and network card are a single object... */
} s_cpu_L07_t, *cpu_L07_t;
@@
-729,7
+729,7
@@
static void ptask_parse_link_init(sg_platf_link_cbarg_t link)
link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
- ptask_link_create_resource(
bprintf("%s_DOWN", link->id)
,
+ ptask_link_create_resource(
link_id
,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->bandwidth,
link->bandwidth_trace,
link->latency,