From 6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f Mon Sep 17 00:00:00 2001 From: navarrop Date: Thu, 24 Mar 2011 10:35:53 +0000 Subject: [PATCH 1/1] Move e_surf_network_element_type_t public. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9834 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 10 ++++++++++ src/surf/surf_private.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 2eac72d9ce..cef3ab7efd 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -46,6 +46,16 @@ typedef enum { SURF_LINK_FATPIPE = 0 } e_surf_link_sharing_policy_t; +typedef enum { + SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ + SURF_NETWORK_ELEMENT_HOST, /* host type */ + SURF_NETWORK_ELEMENT_ROUTER, /* router type */ + SURF_NETWORK_ELEMENT_AS, /* AS type */ +} e_surf_network_element_type_t; + +XBT_PUBLIC(e_surf_network_element_type_t) get_network_element_type(const char + *name); + /** @Brief Specify that we use that action */ XBT_PUBLIC(void) surf_action_ref(surf_action_t action); /** @brief Creates a new action. diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 55a97783d1..c264a261ae 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -142,13 +142,6 @@ typedef enum { SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */ } e_surf_routing_hierarchy_t; -typedef enum { - SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ - SURF_NETWORK_ELEMENT_HOST, /* host type */ - SURF_NETWORK_ELEMENT_ROUTER, /* router type */ - SURF_NETWORK_ELEMENT_AS, /* AS type */ -} e_surf_network_element_type_t; - typedef struct s_routing_component *routing_component_t; typedef struct s_routing_component { xbt_dict_t to_index; /* char* -> network_element_t */ @@ -199,9 +192,6 @@ struct s_routing_global { xbt_dynar_t last_route; }; -XBT_PUBLIC(e_surf_network_element_type_t) get_network_element_type(const char - *name); - XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun); /** -- 2.20.1