Integrate properties into surf_resource_t

[simgrid.git] / src / simdag / sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 6216d41..cad1f73 100644 (file)
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -162,8 +162,7 @@ xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
   SD_CHECK_INIT_DONE();
   xbt_assert0((workstation != NULL), "Invalid parameters");
 
-  return (surf_workstation_model->get_properties
-          (workstation->surf_workstation));
+  return surf_resource_properties(workstation->surf_workstation);
 
 }
 
@@ -182,10 +181,10 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
 {
   void *surf_src;
   void *surf_dst;
-  const void **surf_route;
-  int route_size;
+  xbt_dynar_t surf_route;
   const char *link_name;
-  int i;
+  void *surf_link;
+  unsigned int cpt;
 
   SD_CHECK_INIT_DONE();
 
@@ -200,14 +199,10 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
   surf_route =
     surf_workstation_model->extension.workstation.get_route(surf_src,
                                                             surf_dst);
-  route_size =
-    surf_workstation_model->extension.workstation.get_route_size(surf_src,
-                                                                 surf_dst);
-
 
-  for (i = 0; i < route_size; i++) {
-    link_name = surf_resource_name(surf_route[i]);
-    sd_global->recyclable_route[i] =
+  xbt_dynar_foreach(surf_route, cpt, surf_link) {
+    link_name = surf_resource_name(surf_link);
+    sd_global->recyclable_route[cpt] =
       xbt_dict_get(sd_global->links, link_name);
   }
 
@@ -225,8 +220,8 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
 int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst)
 {
   SD_CHECK_INIT_DONE();
-  return surf_workstation_model->extension.workstation.
-    get_route_size(src->surf_workstation, dst->surf_workstation);
+  return xbt_dynar_length(surf_workstation_model->extension.workstation.get_route(
+        src->surf_workstation,dst->surf_workstation));
 }
 
 /**