From ae7bffe6655b934fc4a09ca1a34e10de5d8dd366 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Tue, 1 Dec 2015 16:48:31 +0100 Subject: [PATCH] [surf] Remove sg_platf_host_link_cb --- src/include/simgrid/platf_interface.h | 1 - src/surf/sg_platf.cpp | 13 ------------- src/surf/surf_routing.cpp | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h index c2b07ea06c..5ffea5b3de 100644 --- a/src/include/simgrid/platf_interface.h +++ b/src/include/simgrid/platf_interface.h @@ -48,7 +48,6 @@ XBT_PUBLIC(void) sg_platf_gpu_add_cb(sg_platf_gpu_cb_t); /* ***************************************** */ XBT_PUBLIC(void) sg_platf_host_add_cb(sg_platf_host_cb_t); -XBT_PUBLIC(void) sg_platf_host_link_add_cb(sg_platf_host_link_cb_t); XBT_PUBLIC(void) sg_platf_link_add_cb(sg_platf_link_cb_t); XBT_PUBLIC(void) sg_platf_peer_add_cb(sg_platf_peer_cb_t fct); XBT_PUBLIC(void) sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct); diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 460886ab62..0471dc9834 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -20,7 +20,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); xbt_dynar_t sg_platf_host_cb_list = NULL; // of sg_platf_host_cb_t -xbt_dynar_t sg_platf_host_link_cb_list = NULL; // of sg_platf_host_link_cb_t xbt_dynar_t sg_platf_link_cb_list = NULL; // of sg_platf_link_cb_t xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t @@ -56,7 +55,6 @@ void sg_platf_init(void) { return; //Already initialized, so do nothing... sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL); - sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL); sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL); sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL); sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL); @@ -81,7 +79,6 @@ void sg_platf_init(void) { /** Module management function: frees all internal data structures */ void sg_platf_exit(void) { xbt_dynar_free(&sg_platf_host_cb_list); - xbt_dynar_free(&sg_platf_host_link_cb_list); xbt_dynar_free(&sg_platf_link_cb_list); xbt_dynar_free(&sg_platf_postparse_cb_list); xbt_dynar_free(&sg_platf_peer_cb_list); @@ -137,13 +134,6 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) fun(host); } } -void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){ - unsigned int iterator; - sg_platf_host_link_cb_t fun; - xbt_dynar_foreach(sg_platf_host_link_cb_list, iterator, fun) { - fun(h); - } -} /** * \brief Add a "router" to the network element list @@ -558,9 +548,6 @@ void sg_platf_gpu_add_cb(sg_platf_gpu_cb_t fct) { void sg_platf_host_add_cb(sg_platf_host_cb_t fct) { xbt_dynar_push(sg_platf_host_cb_list, &fct); } -void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t fct) { - xbt_dynar_push(sg_platf_host_link_cb_list, &fct); -} void sg_platf_link_add_cb(sg_platf_link_cb_t fct) { xbt_dynar_push(sg_platf_link_cb_list, &fct); } diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 3e2f45ff05..439f9d8774 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -122,7 +122,7 @@ struct s_model_type routing_models[] = { /** * \brief Add a "host_link" to the network element list */ -static void parse_S_host(sg_platf_host_link_cbarg_t host) +void sg_platf_new_host_link(sg_platf_host_link_cbarg_t host) { RoutingEdge *info = sg_host_edge(sg_host_by_name(host->id)); xbt_assert(info, "Host '%s' not found!", host->id); @@ -1251,7 +1251,6 @@ static void check_disk_attachment() void routing_register_callbacks() { - sg_platf_host_link_add_cb(parse_S_host); sg_platf_route_add_cb(parse_E_route); sg_platf_ASroute_add_cb(parse_E_ASroute); sg_platf_bypassRoute_add_cb(parse_E_bypassRoute); -- 2.20.1