X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..2c879d143d67b47261ea2dd9060bcaa30a495a24:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index d1bc0fc6f0..bc6057b1dd 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -10,9 +10,10 @@ #include "surf/maxmin.h" #include "surf/trace_mgr.h" #include "xbt/log.h" -#include "surf/surfxml_parse_private.h" +#include "surf/surfxml_parse.h" #include "surf/random_mgr.h" #include "instr/instr_private.h" +#include "surf/surfxml_parse_values.h" #define NO_MAX_DURATION -1.0 @@ -23,15 +24,22 @@ extern double sg_latency_factor; extern double sg_bandwidth_factor; extern double sg_weight_S_parameter; extern int sg_maxmin_selective_update; -extern int sg_network_fullduplex; +extern int sg_network_crosstraffic; #ifdef HAVE_GTNETS extern double sg_gtnets_jitter; extern int sg_gtnets_jitter_seed; #endif +extern xbt_dict_t watched_hosts_lib; extern const char *surf_action_state_names[6]; +typedef enum { + UM_FULL, + UM_LAZY, + UM_UNDEFINED +} e_UM_t; + typedef struct surf_model_private { int (*resource_used) (void *resource_id); /* Share the resources to the actions and return in how much time @@ -42,12 +50,20 @@ typedef struct surf_model_private { void (*update_resource_state) (void *id, tmgr_trace_event_t event_type, double value, double time); void (*finalize) (void); + + lmm_system_t maxmin_system; + e_UM_t update_mechanism; + xbt_swag_t modified_set; + xbt_heap_t action_heap; + int selective_update; + } s_surf_model_private_t; double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset, lmm_system_t sys, void (*solve) (lmm_system_t)); +double generic_share_resources_lazy(double now, surf_model_t model); /* Generic functions common to all models */ void surf_action_init(void); @@ -59,6 +75,28 @@ void surf_action_free(surf_action_t * action); void surf_action_state_set(surf_action_t action, e_surf_action_state_t state); void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */ + +void surf_action_lmm_update_index_heap(void *action, int i); /* callback for heap management shared by cpu and net models */ +void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action, + double key, enum heap_action_type hat); +void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action); + +void surf_action_cancel(surf_action_t action); +int surf_action_unref(surf_action_t action); +void surf_action_suspend(surf_action_t action); +void surf_action_resume(surf_action_t action); +int surf_action_is_suspended(surf_action_t action); +void surf_action_set_max_duration(surf_action_t action, double duration); +void surf_action_set_priority(surf_action_t action, double priority); +#ifdef HAVE_TRACING +void surf_action_set_category(surf_action_t action, + const char *category); +#endif +double surf_action_get_remains(surf_action_t action); +void generic_update_action_remaining_lazy( surf_action_lmm_t action, double now); +void generic_update_actions_state_lazy(double now, double delta, surf_model_t model); +void generic_update_actions_state_full(double now, double delta, surf_model_t model); + FILE *surf_fopen(const char *name, const char *mode); extern tmgr_history_t history; @@ -73,7 +111,7 @@ double net_action_get_remains(surf_action_t action); #ifdef HAVE_LATENCY_BOUND_TRACKING int net_get_link_latency_limited(surf_action_t action); #endif -void net_action_set_max_duration(surf_action_t action, double duration); + /* * Returns the initial path. On Windows the initial path is * the current directory for the current process in the other @@ -88,12 +126,20 @@ const char *__surf_get_initial_path(void); */ int __surf_is_absolute_file_path(const char *file_path); +typedef struct s_as *AS_t; +typedef struct s_routing_edge { + AS_t rc_component; + e_surf_network_element_type_t rc_type; + int id; + char *name; +} s_routing_edge_t; + /* - * One link routing list + * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3 */ typedef struct s_onelink { - char *src; - char *dst; + sg_routing_edge_t src; + sg_routing_edge_t dst; void *link_ptr; } s_onelink_t, *onelink_t; @@ -104,105 +150,68 @@ typedef struct s_onelink { 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; - -typedef struct s_route { - xbt_dynar_t link_list; -} s_route_t, *route_t; - -typedef struct s_name_route { - xbt_dynar_t link_name_list; -} s_name_route_t, *name_route_t; - -typedef struct s_name_route_extended { - s_route_t generic_route; - char *src_gateway; - char *dst_gateway; -} s_name_route_extended_t, *name_route_extended_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; - char *dst_gateway; -} s_route_extended_t, *route_extended_t; + AS_t (*create) (); + void (*end) (AS_t as); +} s_routing_model_description_t, *routing_model_description_t; /* 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 struct s_routing_component *routing_component_t; -typedef struct s_routing_component { - xbt_dict_t to_index; /* char* -> network_element_t */ - xbt_dict_t bypassRoutes; /* store bypass routes */ - model_type_t routing; +typedef struct s_as { + xbt_dynar_t index_network_elm; + xbt_dict_t bypassRoutes; /* store bypass routes */ + routing_model_description_t model_desc; 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); - double(*get_latency) (routing_component_t rc, const char *src, - const char *dst, route_extended_t e_route); - 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, name_route_extended_t route); - void (*set_ASroute) (routing_component_t rc, const char *src, - const char *dst, name_route_extended_t route); - void (*set_bypassroute) (routing_component_t rc, const char *src, - const char *dst, route_extended_t e_route); -} s_routing_component_t; - -typedef struct s_network_element_info { - routing_component_t rc_component; - e_surf_network_element_type_t rc_type; -} s_network_element_info_t, *network_element_info_t; + sg_routing_edge_t net_elem; + xbt_dynar_t link_up_down_list; + + void (*get_route_and_latency) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, sg_platf_route_cbarg_t into, double *latency); + + xbt_dynar_t(*get_onelink_routes) (AS_t as); + sg_platf_route_cbarg_t(*get_bypass_route) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, double *lat); + 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 */ + int (*parse_PU) (AS_t as, sg_routing_edge_t elm); /* A host or a router, whatever */ + int (*parse_AS) (AS_t as, sg_routing_edge_t elm); + void (*parse_route) (AS_t as, sg_platf_route_cbarg_t route); + void (*parse_ASroute) (AS_t as, sg_platf_route_cbarg_t route); + void (*parse_bypassroute) (AS_t as, sg_platf_route_cbarg_t e_route); -typedef int *network_element_t; +} s_as_t; -struct s_routing_global { - routing_component_t root; +struct s_routing_platf { + 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_or_null) (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); - 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); - void (*finalize) (void); xbt_dynar_t last_route; + xbt_dynar_t(*get_onelink_routes) (void); }; -XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun); +XBT_PUBLIC(void) routing_model_create(void *loopback); +XBT_PUBLIC(void) routing_exit(void); +XBT_PUBLIC(void) storage_register_callbacks(void); +XBT_PUBLIC(void) routing_register_callbacks(void); +XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free + // FIXME: make previous function private to routing again? -XBT_PUBLIC(void) routing_parse_Scluster(void); /* cluster bypass */ + +XBT_PUBLIC(void) routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, + xbt_dynar_t * route, double *latency); /** * Resource protected methods */ -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);