X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6966c8c5c85f79388af1211807260b14f45aa6ca..6e8589d6a8476d3d6dd2453d933ed9759cd215b0:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 27b1c1f636..c64ce9d095 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -21,9 +21,7 @@ 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_prop_cb_list = NULL; // of sg_platf_prop_cb_t xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t xbt_dynar_t sg_platf_bypassRoute_cb_list = NULL; // of sg_platf_bypassRoute_cb_t @@ -53,9 +51,7 @@ 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_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL); sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL); sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL); @@ -75,8 +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_prop_cb_list); xbt_dynar_free(&sg_platf_trace_cb_list); xbt_dynar_free(&sg_platf_trace_connect_cb_list); @@ -182,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), @@ -337,13 +325,6 @@ void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) { fun(bypassASroute); } } -void sg_platf_new_prop(sg_platf_prop_cbarg_t prop) { - unsigned int iterator; - sg_platf_prop_cb_t fun; - xbt_dynar_foreach(sg_platf_prop_cb_list, iterator, fun) { - fun(prop); - } -} void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { unsigned int iterator; sg_platf_trace_cb_t fun; @@ -528,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); } @@ -543,9 +521,6 @@ void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t fct) { void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) { xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct); } -void sg_platf_prop_add_cb(sg_platf_prop_cb_t fct) { - xbt_dynar_push(sg_platf_prop_cb_list, &fct); -} void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) { xbt_dynar_push(sg_platf_trace_cb_list, &fct); }