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
Regenerate files with latest flexml.
[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
..
861e404
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;
@@
-195,8
+195,8
@@
static void ptask_action_set_priority(surf_action_t action,
static double ptask_action_get_remains(surf_action_t action)
{
XBT_IN("(%p)", action);
static double ptask_action_get_remains(surf_action_t action)
{
XBT_IN("(%p)", action);
- return action->remains;
XBT_OUT();
XBT_OUT();
+ return action->remains;
}
/**************************************/
}
/**************************************/
@@
-454,7
+454,7
@@
static surf_action_t ptask_execute_parallel_task(int workstation_nb,
double latency = 0.0;
if (ptask_parallel_task_link_set == NULL)
double latency = 0.0;
if (ptask_parallel_task_link_set == NULL)
- ptask_parallel_task_link_set = xbt_dict_new
(
);
+ ptask_parallel_task_link_set = xbt_dict_new
_homogeneous(NULL
);
xbt_dict_reset(ptask_parallel_task_link_set);
xbt_dict_reset(ptask_parallel_task_link_set);
@@
-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,
@@
-890,7
+890,7
@@
static void ptask_model_init_internal(void)
ptask_add_traces;
if (!ptask_maxmin_system)
ptask_add_traces;
if (!ptask_maxmin_system)
- ptask_maxmin_system = lmm_system_new();
+ ptask_maxmin_system = lmm_system_new(
1
);
routing_model_create(sizeof(link_L07_t),
ptask_link_create_resource("__loopback__",
routing_model_create(sizeof(link_L07_t),
ptask_link_create_resource("__loopback__",