From 5d9f27f6396cd1a4dddacc2a743ad697b9e342b9 Mon Sep 17 00:00:00 2001 From: quasar Date: Fri, 26 Oct 2007 18:01:06 +0000 Subject: [PATCH 1/1] move the callback lists to the public headers git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4882 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/surf/surfxml_parse.h | 38 +++++++++++++++++------------------- src/include/surf/surf.h | 20 ------------------- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h index 0d69e6ae1c..342d25cd9b 100644 --- a/include/surf/surfxml_parse.h +++ b/include/surf/surfxml_parse.h @@ -18,26 +18,24 @@ XBT_PUBLIC_DATA(int_f_void_t) surf_parse; /* Hook for the different tags. They can be redefined at will whereas the versions without the _fun can't. */ -/* -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_platform_description_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_platform_description_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_cpu_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_cpu_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_router_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_router_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_network_link_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_network_link_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_route_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_route_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_route_element_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_route_element_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_process_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_process_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_argument_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_argument_fun; -XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_prop_fun; -XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_prop_fun; -*/ +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_platform_description_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_description_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_host_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_host_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_router_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_router_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_c_ctn_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_c_ctn_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_process_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_process_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_argument_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_argument_cb_list; +XBT_PUBLIC(xbt_dynar_t) STag_surfxml_prop_cb_list; +XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_prop_cb_list; XBT_PUBLIC(void) surf_parse_open(const char *file); XBT_PUBLIC(void) surf_parse_close(void); diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index d05507dd0a..fb139cb8b3 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -552,26 +552,6 @@ XBT_PUBLIC(void) surf_exit(void); void parse_properties(void); void free_string(void*); -/*Add callback lists*/ -xbt_dynar_t STag_surfxml_platform_description_cb_list; -xbt_dynar_t ETag_surfxml_platform_description_cb_list; -xbt_dynar_t STag_surfxml_host_cb_list; -xbt_dynar_t ETag_surfxml_host_cb_list; -xbt_dynar_t STag_surfxml_router_cb_list; -xbt_dynar_t ETag_surfxml_router_cb_list; -xbt_dynar_t STag_surfxml_link_cb_list; -xbt_dynar_t ETag_surfxml_link_cb_list; -xbt_dynar_t STag_surfxml_route_cb_list; -xbt_dynar_t ETag_surfxml_route_cb_list; -xbt_dynar_t STag_surfxml_link_c_ctn_cb_list; -xbt_dynar_t ETag_surfxml_link_c_ctn_cb_list; -xbt_dynar_t STag_surfxml_process_cb_list; -xbt_dynar_t ETag_surfxml_process_cb_list; -xbt_dynar_t STag_surfxml_argument_cb_list; -xbt_dynar_t ETag_surfxml_argument_cb_list; -xbt_dynar_t STag_surfxml_prop_cb_list; -xbt_dynar_t ETag_surfxml_prop_cb_list; - XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function); SG_END_DECL() -- 2.20.1