X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/715060b191e4ff4b070c59ea7e5c643c7365791a..65dc5e18ada92df9d138177c059be127a10810f5:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 2483f302f4..5162f6806c 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -12,12 +12,14 @@ #include "xbt/log.h" #include "surf/surfxml_parse_private.h" #include "surf/random_mgr.h" -#include "instr/private.h" +#include "instr/instr_private.h" +#include "surf/surfxml_parse_values.h" #define NO_MAX_DURATION -1.0 /* user-visible parameters */ extern double sg_tcp_gamma; +extern double sg_sender_gap; extern double sg_latency_factor; extern double sg_bandwidth_factor; extern double sg_weight_S_parameter; @@ -49,6 +51,8 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, void (*solve) (lmm_system_t)); /* Generic functions common to all models */ +void surf_action_init(void); +void surf_action_exit(void); e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */ double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */ double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */ @@ -97,25 +101,19 @@ typedef struct s_onelink { /** * Routing logic */ +typedef struct s_as *AS_t; typedef struct s_model_type { const char *name; const char *desc; - void *(*create) (); - void (*load) (); - void (*unload) (); - void (*end) (); -} s_model_type_t, *model_type_t; + AS_t (*create) (); + void (*end) (AS_t as); +} s_routing_model_description_t, *routing_model_description_t; typedef struct s_route { xbt_dynar_t link_list; } s_route_t, *route_t; -typedef struct s_route_limits { - char *src_gateway; - char *dst_gateway; -} s_route_limits_t, *route_limits_t; - typedef struct s_route_extended { s_route_t generic_route; char *src_gateway; @@ -124,73 +122,72 @@ typedef struct s_route_extended { /* This enum used in the routing structure helps knowing in which situation we are. */ typedef enum { - SURF_ROUTING_NULL = 0, /**< Indefined type */ + SURF_ROUTING_NULL = 0, /**< Undefined type */ SURF_ROUTING_BASE, /**< Base case: use simple link lists for routing */ 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 { +typedef struct s_as { xbt_dict_t to_index; /* char* -> network_element_t */ - xbt_dict_t parse_routes; /* store data during the parse process */ xbt_dict_t bypassRoutes; /* store bypass routes */ - model_type_t routing; + routing_model_description_t routing; e_surf_routing_hierarchy_t hierarchy; char *name; - struct s_routing_component *routing_father; + struct s_as *routing_father; xbt_dict_t routing_sons; - route_extended_t(*get_route) (routing_component_t rc, const char *src, - const char *dst); - xbt_dynar_t(*get_onelink_routes) (routing_component_t rc); - e_surf_network_element_type_t(*get_network_element_type) (const char - *name); - route_extended_t(*get_bypass_route) (routing_component_t rc, - const char *src, const char *dst); - void (*finalize) (routing_component_t rc); - void (*set_processing_unit) (routing_component_t rc, const char *name); - void (*set_autonomous_system) (routing_component_t rc, const char *name); - void (*set_route) (routing_component_t rc, const char *src, - const char *dst, route_t route); - void (*set_ASroute) (routing_component_t rc, const char *src, + route_extended_t(*get_route) (AS_t as, const char *src, + const char *dst); + double(*get_latency) (AS_t as, const char *src, + const char *dst, route_extended_t e_route); + xbt_dynar_t(*get_onelink_routes) (AS_t as); + e_surf_network_element_type_t(*get_network_element_type) (const char *name); + route_extended_t(*get_bypass_route) (AS_t as, + const char *src, const char *dst); + void (*finalize) (AS_t as); + /* The parser calls the following functions to inform the routing models + * that a new element is added to the AS currently built. + * + * Of course, only the routing model of this AS is informed, not every ones */ + void (*parse_PU) (AS_t as, const char *name); /* A host or a router, whatever */ + void (*parse_AS) (AS_t as, const char *name); + void (*parse_route) (AS_t as, const char *src, + const char *dst, route_extended_t route); + void (*parse_ASroute) (AS_t as, const char *src, const char *dst, route_extended_t route); - void (*set_bypassroute) (routing_component_t rc, const char *src, + void (*parse_bypassroute) (AS_t as, const char *src, const char *dst, route_extended_t e_route); -} s_routing_component_t; +} s_as_t; typedef struct s_network_element_info { - routing_component_t rc_component; + AS_t rc_component; e_surf_network_element_type_t rc_type; } s_network_element_info_t, *network_element_info_t; typedef int *network_element_t; struct s_routing_global { - routing_component_t root; - xbt_dict_t where_network_elements; /* char* -> network_element_info_t */ + AS_t root; void *loopback; size_t size_of_link; - xbt_dynar_t(*get_route) (const char *src, const char *dst); - xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst); - xbt_dynar_t(*get_onelink_routes) (void); - e_surf_network_element_type_t(*get_network_element_type) (const char - *name); - void (*finalize) (void); + xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst); + xbt_dynar_t(*get_onelink_routes) (void); + double (*get_latency) (const char *src, const char *dst); + void (*get_route_latency)(const char *src, const char *dst, + xbt_dynar_t *route, double *latency, int cleanup); + e_surf_network_element_type_t(*get_network_element_type) (const char *name); xbt_dynar_t last_route; }; XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback); +XBT_PUBLIC(void) routing_exit(void); +XBT_PUBLIC(void) routing_register_callbacks(void); + +XBT_PUBLIC(xbt_dynar_t) routing_get_route(const char *src, const char *dst); /** * Resource protected methods */ -xbt_dict_t surf_resource_properties(const void *resource); +static XBT_INLINE xbt_dict_t surf_resource_properties(const void *resource); XBT_PUBLIC(void) surfxml_bufferstack_push(int new); XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);