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) {
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- global_routing->finalize();
ptask_host_count = 0;
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)
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;
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)
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,