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 '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
01f6019
..
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;
@@
-81,13
+81,13
@@
static void ptask_update_action_bound(surf_action_workstation_L07_t action)
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- xbt_dynar_t route =
- global_routing->get_route(surf_resource_name
- (action->workstation_list[i]),
- surf_resource_name(action->
- workstation_list
- [j]));
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(surf_resource_name
+ (action->workstation_list[i]),
+ surf_resource_name(action->workstation_list[j]),
+ &route, NULL);
+ // FIXME do we really need to recompute the latency here?
double lat = 0.0;
if (action->communication_amount[i * workstation_nb + j] > 0) {
double lat = 0.0;
if (action->communication_amount[i * workstation_nb + j] > 0) {
@@
-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;
}
/**************************************/
}
/**************************************/
@@
-410,7
+410,6
@@
static void ptask_finalize(void)
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- global_routing->finalize();
ptask_host_count = 0;
ptask_host_count = 0;
@@
-455,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);
@@
-463,11
+462,11
@@
static surf_action_t ptask_execute_parallel_task(int workstation_nb,
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
link_L07_t link;
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
link_L07_t link;
- xbt_dynar_t route
=
- global_routing->get_route(surf_resource_name
-
(workstation_list[i]),
- surf_resource_name(workstation_list
- [j]));
+ xbt_dynar_t route
=NULL;
+ routing_get_route_and_latency(
+
surf_resource_name
(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+ &route,NULL); // FIXME: do we want to recompute the latency?
double lat = 0.0;
if (communication_amount[i * workstation_nb + j] > 0)
double lat = 0.0;
if (communication_amount[i * workstation_nb + j] > 0)
@@
-517,11
+516,11
@@
static surf_action_t ptask_execute_parallel_task(int workstation_nb,
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
link_L07_t link;
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
link_L07_t link;
- xbt_dynar_t route
=
- global_routing->get_route(surf_resource_name
-
(workstation_list[i]),
- surf_resource_name(workstation_list
-
[j])
);
+ xbt_dynar_t route
=NULL;
+ routing_get_route_and_latency(
+
surf_resource_name
(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+
&route,NULL
);
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
@@
-590,10
+589,13
@@
static surf_action_t ptask_action_sleep(void *cpu, double duration)
return (surf_action_t) action;
}
return (surf_action_t) action;
}
-static xbt_dynar_t ptask_get_route(void *src, void *dst)
+static xbt_dynar_t ptask_get_route(void *src, void *dst)
// FIXME: kill that callback kind?
{
{
- return global_routing->get_route(surf_resource_name(src),
- surf_resource_name(dst));
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(
+ surf_resource_name(src), surf_resource_name(dst),
+ &route,NULL);
+ return route;
}
static double ptask_get_link_bandwidth(const void *link)
}
static double ptask_get_link_bandwidth(const void *link)
@@
-727,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,
@@
-888,15
+890,14
@@
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__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
routing_model_create(sizeof(link_L07_t),
ptask_link_create_resource("__loopback__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- ptask_get_link_latency);
+ SURF_LINK_FATPIPE, NULL));
}
}