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

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index b38c3d9..da5b5d3 100644 (file)
--- 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_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)
   {
 
   if(surf_route == NULL)
   {

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 613305a..37ef666 100644 (file)
--- 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)
 {
 
 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)
 }
 
 static double ptask_get_link_bandwidth(const void *link)