From f1eff61a53a6a41c1c9b233d7eecf9149ca0f5b4 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 08:53:19 +0000 Subject: [PATCH] Change way to call get_route git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8263 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simdag/sd_workstation.c | 4 ++-- src/surf/workstation_ptask_L07.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index b38c3d9526..da5b5d3d7a 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -199,8 +199,8 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst) surf_src = &src->surf_workstation; surf_dst = &dst->surf_workstation; - - surf_route = surf_workstation_model->extension.workstation.get_route(surf_src,surf_dst); + surf_route = surf_workstation_model->extension.workstation.get_route( + (void*)SD_workstation_get_name(src),(void*)SD_workstation_get_name(dst)); if(surf_route == NULL) { diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 613305a19a..37ef666e1c 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -575,10 +575,8 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration) static xbt_dynar_t ptask_get_route(void *src, void *dst) { -// cpu_L07_t host_src = src; // COMMENTED BY DAVID -// cpu_L07_t host_dst = dst; // COMMENTED BY DAVID - - return NULL;// used_routing->get_route(host_src->id, host_dst->id); // COMMENTED BY DAVID + return global_routing->get_route((char *) src,(char *) dst); + //return NULL; used_routing->get_route(host_src->id, host_dst->id); // COMMENTED BY DAVID } static double ptask_get_link_bandwidth(const void *link) -- 2.20.1