From c1a1042ca3cd2979858779afff318cbe5f4b6cbf Mon Sep 17 00:00:00 2001 From: navarro Date: Mon, 6 Aug 2012 16:35:49 +0200 Subject: [PATCH] CleanUp unused xbt_dynar_t from callback --- include/surf/surfxml_parse.h | 18 -------- src/surf/surf_routing.c | 1 - src/surf/surfxml_parse.c | 87 ++---------------------------------- 3 files changed, 4 insertions(+), 102 deletions(-) diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h index 98c47d2d10..6d34abfce7 100644 --- a/include/surf/surfxml_parse.h +++ b/include/surf/surfxml_parse.h @@ -16,10 +16,6 @@ SG_BEGIN_DECL() /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */ -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_route_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_route_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_link_ctn_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_link_ctn_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_process_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_process_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_argument_cb_list; @@ -30,20 +26,6 @@ XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_trace_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_trace_connect_cb_list; XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_connect_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_random_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_random_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_ASroute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassASroute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassASroute_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_include_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_include_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_storage_cb_list; -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_storage_cb_list; XBT_PUBLIC(void) surf_parse_open(const char *file); XBT_PUBLIC(void) surf_parse_close(void); diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index b3a8d72930..5a026eef91 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1147,7 +1147,6 @@ void routing_register_callbacks() sg_platf_AS_end_add_cb(routing_AS_end); sg_platf_AS_begin_add_cb(routing_AS_begin); - surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); #ifdef HAVE_TRACING diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 873ec5a08a..e2a0e4c14a 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -64,40 +64,16 @@ int surf_parse_get_int(const char *string) { */ /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */ -xbt_dynar_t STag_surfxml_route_cb_list = NULL; -xbt_dynar_t ETag_surfxml_route_cb_list = NULL; -xbt_dynar_t ETag_surfxml_link_ctn_cb_list = NULL; xbt_dynar_t STag_surfxml_process_cb_list = NULL; xbt_dynar_t ETag_surfxml_process_cb_list = NULL; xbt_dynar_t STag_surfxml_argument_cb_list = NULL; xbt_dynar_t ETag_surfxml_argument_cb_list = NULL; xbt_dynar_t STag_surfxml_prop_cb_list = NULL; xbt_dynar_t ETag_surfxml_prop_cb_list = NULL; -xbt_dynar_t STag_surfxml_peer_cb_list = NULL; -xbt_dynar_t ETag_surfxml_peer_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_cb_list = NULL; xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL; xbt_dynar_t ETag_surfxml_trace_connect_cb_list = NULL; -xbt_dynar_t STag_surfxml_random_cb_list = NULL; -xbt_dynar_t ETag_surfxml_random_cb_list = NULL; -xbt_dynar_t STag_surfxml_ASroute_cb_list = NULL; -xbt_dynar_t ETag_surfxml_ASroute_cb_list = NULL; -xbt_dynar_t STag_surfxml_bypassRoute_cb_list = NULL; -xbt_dynar_t ETag_surfxml_bypassRoute_cb_list = NULL; -xbt_dynar_t STag_surfxml_bypassASroute_cb_list = NULL; -xbt_dynar_t ETag_surfxml_bypassASroute_cb_list = NULL; -xbt_dynar_t STag_surfxml_include_cb_list = NULL; -xbt_dynar_t ETag_surfxml_include_cb_list = NULL; - -xbt_dynar_t STag_surfxml_storage_cb_list = NULL; -xbt_dynar_t ETag_surfxml_storage_cb_list = NULL; -xbt_dynar_t STag_surfxml_storage_type_cb_list = NULL; -xbt_dynar_t ETag_surfxml_storage_type_cb_list = NULL; -xbt_dynar_t STag_surfxml_mount_cb_list = NULL; -xbt_dynar_t ETag_surfxml_mount_cb_list = NULL; -xbt_dynar_t STag_surfxml_mstorage_cb_list = NULL; -xbt_dynar_t ETag_surfxml_mstorage_cb_list = NULL; /* The default current property receiver. Setup in the corresponding opening callbacks. */ xbt_dict_t current_property_set = NULL; @@ -241,9 +217,6 @@ int ETag_surfxml_include_state(void) void surf_parse_init_callbacks(void) { sg_platf_init(); // FIXME: move to a proper place? - - STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); STag_surfxml_process_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_process_cb_list = @@ -260,37 +233,6 @@ void surf_parse_init_callbacks(void) xbt_dynar_new(sizeof(void_f_void_t), NULL); ETag_surfxml_trace_connect_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_random_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_ASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_ASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_bypassRoute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_bypassRoute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_bypassASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_bypassASroute_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_peer_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_peer_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_include_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_include_cb_list = - xbt_dynar_new(sizeof(void_f_void_t), NULL); - - STag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_storage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_storage_type_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_mount_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_mount_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - STag_surfxml_mstorage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); - ETag_surfxml_mstorage_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL); } void surf_parse_reset_callbacks(void) @@ -303,8 +245,6 @@ void surf_parse_free_callbacks(void) { sg_platf_exit(); // FIXME: better place? - xbt_dynar_free(&STag_surfxml_route_cb_list); - xbt_dynar_free(&ETag_surfxml_route_cb_list); xbt_dynar_free(&STag_surfxml_process_cb_list); xbt_dynar_free(&ETag_surfxml_process_cb_list); xbt_dynar_free(&STag_surfxml_argument_cb_list); @@ -315,27 +255,6 @@ void surf_parse_free_callbacks(void) xbt_dynar_free(&ETag_surfxml_trace_cb_list); xbt_dynar_free(&STag_surfxml_trace_connect_cb_list); xbt_dynar_free(&ETag_surfxml_trace_connect_cb_list); - xbt_dynar_free(&STag_surfxml_random_cb_list); - xbt_dynar_free(&ETag_surfxml_random_cb_list); - xbt_dynar_free(&STag_surfxml_ASroute_cb_list); - xbt_dynar_free(&ETag_surfxml_ASroute_cb_list); - xbt_dynar_free(&STag_surfxml_bypassRoute_cb_list); - xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list); - xbt_dynar_free(&STag_surfxml_bypassASroute_cb_list); - xbt_dynar_free(&ETag_surfxml_bypassASroute_cb_list); - xbt_dynar_free(&STag_surfxml_peer_cb_list); - xbt_dynar_free(&ETag_surfxml_peer_cb_list); - xbt_dynar_free(&STag_surfxml_include_cb_list); - xbt_dynar_free(&ETag_surfxml_include_cb_list); - - xbt_dynar_free(&STag_surfxml_storage_cb_list); - xbt_dynar_free(&ETag_surfxml_storage_cb_list); - xbt_dynar_free(&STag_surfxml_mstorage_cb_list); - xbt_dynar_free(&ETag_surfxml_mstorage_cb_list); - xbt_dynar_free(&STag_surfxml_mount_cb_list); - xbt_dynar_free(&ETag_surfxml_mount_cb_list); - xbt_dynar_free(&STag_surfxml_storage_type_cb_list); - xbt_dynar_free(&ETag_surfxml_storage_type_cb_list); } /* Stag and Etag parse functions */ @@ -737,7 +656,10 @@ void ETag_surfxml_config(void){ xbt_dict_free(¤t_property_set); } void STag_surfxml_random(void){ - surfxml_call_cb_functions(STag_surfxml_random_cb_list); +//TODO +} +void ETag_surfxml_random(void){ +//TODO } #define parse_method(type,name) \ @@ -750,7 +672,6 @@ parse_method(E, argument); parse_method(E, prop); parse_method(E, trace); parse_method(E, trace_connect); -parse_method(E, random); /* Open and Close parse file */ -- 2.20.1