From 6e8589d6a8476d3d6dd2453d933ed9759cd215b0 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 2 Dec 2015 11:18:04 +0100 Subject: [PATCH] [surf] Remove sg_cabinet_cb --- src/include/simgrid/platf_interface.h | 1 - src/surf/sg_platf.cpp | 14 +------------- src/surf/surf_routing.cpp | 3 +-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h index eef7296f99..2e031133b2 100644 --- a/src/include/simgrid/platf_interface.h +++ b/src/include/simgrid/platf_interface.h @@ -49,7 +49,6 @@ XBT_PUBLIC(void) sg_platf_gpu_add_cb(sg_platf_gpu_cb_t); XBT_PUBLIC(void) sg_platf_link_add_cb(sg_platf_link_cb_t); XBT_PUBLIC(void) sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct); -XBT_PUBLIC(void) sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct); XBT_PUBLIC(void) sg_platf_postparse_add_cb(void_f_void_t fct); XBT_PUBLIC(void) sg_platf_ASroute_add_cb(sg_platf_route_cb_t); diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 2bdf9d69ad..c64ce9d095 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -21,7 +21,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); xbt_dynar_t sg_platf_link_cb_list = NULL; // of sg_platf_link_cb_t xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t -xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t @@ -52,7 +51,6 @@ void sg_platf_init(void) { sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL); sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL); - sg_platf_cabinet_cb_list = xbt_dynar_new(sizeof(sg_platf_cabinet_cb_t), NULL); sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL); sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL); @@ -73,7 +71,6 @@ void sg_platf_exit(void) { xbt_dynar_free(&sg_platf_link_cb_list); xbt_dynar_free(&sg_platf_postparse_cb_list); xbt_dynar_free(&sg_platf_cluster_cb_list); - xbt_dynar_free(&sg_platf_cabinet_cb_list); xbt_dynar_free(&sg_platf_trace_cb_list); xbt_dynar_free(&sg_platf_trace_connect_cb_list); @@ -179,13 +176,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){ fun(cluster); } } -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){ - unsigned int iterator; - sg_platf_cabinet_cb_t fun; - xbt_dynar_foreach(sg_platf_cabinet_cb_list, iterator, fun) { - fun(cabinet); - } -} + void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) { xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), @@ -518,9 +509,6 @@ void sg_platf_link_add_cb(sg_platf_link_cb_t fct) { void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) { xbt_dynar_push(sg_platf_cluster_cb_list, &fct); } -void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) { - xbt_dynar_push(sg_platf_cabinet_cb_list, &fct); -} void sg_platf_postparse_add_cb(void_f_void_t fct) { xbt_dynar_push(sg_platf_postparse_cb_list, &fct); } diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 90fb47cdeb..9e7f208256 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -687,7 +687,7 @@ void routing_cluster_add_backbone(void* bb) { XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name); } -static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet) +void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) { int start, end, i; char *groups , *host_id , *link_id = NULL; @@ -1243,7 +1243,6 @@ void routing_register_callbacks() sg_platf_bypassASroute_add_cb(parse_E_bypassASroute); sg_platf_cluster_add_cb(routing_parse_cluster); - sg_platf_cabinet_add_cb(routing_parse_cabinet); sg_platf_postparse_add_cb(routing_parse_postparse); sg_platf_postparse_add_cb(check_disk_attachment); -- 2.20.1