From e9f0ea64dae57d4118db617764164d717620820a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 19 Jul 2015 08:49:55 +0200 Subject: [PATCH] kill some remainings of sd_link_t --- include/surf/surf_routing.h | 1 - src/simdag/sd_link.c | 2 +- src/simdag/sd_workstation.c | 5 +---- src/surf/surf_routing.cpp | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h index da83650af5..7071aa126b 100644 --- a/include/surf/surf_routing.h +++ b/include/surf/surf_routing.h @@ -20,7 +20,6 @@ XBT_PUBLIC_DATA(int) COORD_HOST_LEVEL; //Coordinates level XBT_PUBLIC_DATA(int) NS3_HOST_LEVEL; //host node for ns3 XBT_PUBLIC_DATA(xbt_lib_t) link_lib; -XBT_PUBLIC_DATA(int) SD_LINK_LEVEL; //Simdag level XBT_PUBLIC_DATA(int) SURF_LINK_LEVEL; //Surf level XBT_PUBLIC_DATA(int) NS3_LINK_LEVEL; //link for ns3 diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c index 98dd68854e..c786087b34 100644 --- a/src/simdag/sd_link.c +++ b/src/simdag/sd_link.c @@ -32,7 +32,7 @@ const SD_link_t *SD_link_get_list(void) i = 0; xbt_lib_foreach(link_lib, cursor, key, data) { - sd_global->link_list[i++] = (SD_link_t) data[SD_LINK_LEVEL]; + sd_global->link_list[i++] = (SD_link_t) data[SURF_LINK_LEVEL]; } } return sd_global->link_list; diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 5f8ebcc2e0..e7062c2689 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -221,7 +221,6 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, void *surf_src; void *surf_dst; xbt_dynar_t surf_route; - const char *link_name; void *surf_link; unsigned int cpt; @@ -237,9 +236,7 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, surf_src, surf_dst); xbt_dynar_foreach(surf_route, cpt, surf_link) { - link_name = surf_resource_name(surf_link); - sd_global->recyclable_route[cpt] = - xbt_lib_get_or_null(link_lib, link_name, SD_LINK_LEVEL); + sd_global->recyclable_route[cpt] = surf_link; } return sd_global->recyclable_route; } diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index d445c46741..325d2bfce9 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -36,7 +36,6 @@ int NS3_HOST_LEVEL; //host node for ns3 * @brief A library containing all known links */ xbt_lib_t link_lib; -int SD_LINK_LEVEL; //Simdag level int SURF_LINK_LEVEL; //Surf level xbt_lib_t as_router_lib; -- 2.20.1