X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04b62daf10d4a89e8a74ec793403183009da153b..b362f44b3941a4b07a255240da19066915fbacb3:/src/surf/workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 1c3288c74a..d3d78ce8d5 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -560,19 +560,32 @@ static surf_action_t execute_parallel_task(int cpu_nb,
   return NULL;
 }
 
-static void* get_route(void *src, void *dst) {
-  /* TODO: return a NULL-terminated array of network_link_KCCFLN05_t */
+/* returns an array of network_link_KCCFLN05_t */
+static const void** get_route(void *src, void *dst) {
+  cpu_KCCFLN05_t card_src = src;
+  cpu_KCCFLN05_t card_dst = dst;
+  route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id));
+
+  return (const void**) route->links;
+}
 
+static int get_route_size(void *src, void *dst) {
   cpu_KCCFLN05_t card_src = src;
   cpu_KCCFLN05_t card_dst = dst;
   route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id));
-  int route_size = route->size;
+  return route->size;
+}
 
-  network_link_KCCFLN05_t *link_list = route->links;
-  link_list = xbt_realloc(link_list, (route_size+1) * sizeof(route_KCCFLN05_t));
-  link_list[route_size] = NULL;
+static const char *get_link_name(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->bw_current;
+}
 
-  return link_list;
+static double get_link_latency(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->lat_current;
 }
 
 /**************************************/
@@ -925,6 +938,10 @@ static void resource_init_internal(void)
   surf_workstation_resource->extension_public->communicate = communicate;
   surf_workstation_resource->extension_public->execute_parallel_task = execute_parallel_task;
   surf_workstation_resource->extension_public->get_route = get_route;
+  surf_workstation_resource->extension_public->get_route_size = get_route_size;
+  surf_workstation_resource->extension_public->get_link_name = get_link_name;
+  surf_workstation_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
+  surf_workstation_resource->extension_public->get_link_latency = get_link_latency;
 
   workstation_set = xbt_dict_new();
   network_link_set = xbt_dict_new();