X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/127880536a17bd02faba5e25df542b50c9fe72cc..2c879d143d67b47261ea2dd9060bcaa30a495a24:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index ff8b6b0cb0..bc6057b1dd 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -17,12 +17,6 @@ #define NO_MAX_DURATION -1.0 -typedef enum { - UM_FULL, - UM_LAZY, - UM_UNDEFINED -} e_UM_t; - /* user-visible parameters */ extern double sg_tcp_gamma; extern double sg_sender_gap; @@ -36,9 +30,16 @@ 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 @@ -49,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); @@ -72,6 +81,21 @@ 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); @@ -87,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 @@ -103,19 +127,19 @@ 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_network_element_info { +typedef struct s_routing_edge { AS_t rc_component; e_surf_network_element_type_t rc_type; int id; char *name; -} s_network_element_t; +} s_routing_edge_t; /* * 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 { - network_element_t src; - network_element_t dst; + sg_routing_edge_t src; + sg_routing_edge_t dst; void *link_ptr; } s_onelink_t, *onelink_t; @@ -130,12 +154,6 @@ typedef struct s_model_type { void (*end) (AS_t as); } s_routing_model_description_t, *routing_model_description_t; -typedef struct s_route { - xbt_dynar_t link_list; - network_element_t src_gateway; - network_element_t dst_gateway; -} s_route_t, *route_t; - /* This enum used in the routing structure helps knowing in which situation we are. */ typedef enum { SURF_ROUTING_NULL = 0, /**< Undefined type */ @@ -145,19 +163,19 @@ typedef enum { typedef struct s_as { xbt_dynar_t index_network_elm; - xbt_dict_t bypassRoutes; /* store bypass routes */ + xbt_dict_t bypassRoutes; /* store bypass routes */ routing_model_description_t model_desc; e_surf_routing_hierarchy_t hierarchy; char *name; struct s_as *routing_father; xbt_dict_t routing_sons; - network_element_t net_elem; + sg_routing_edge_t net_elem; xbt_dynar_t link_up_down_list; - void (*get_route_and_latency) (AS_t as, network_element_t src, network_element_t dst, route_t into, double *latency); + 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); - route_t(*get_bypass_route) (AS_t as, network_element_t src, network_element_t dst); + 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); @@ -165,40 +183,35 @@ typedef struct s_as { * 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, network_element_t elm); /* A host or a router, whatever */ - int (*parse_AS) (AS_t as, network_element_t elm); - void (*parse_route) (AS_t as, const char *src, - const char *dst, route_t route); - void (*parse_ASroute) (AS_t as, const char *src, - const char *dst, route_t route); - void (*parse_bypassroute) (AS_t as, const char *src, - const char *dst, route_t e_route); + 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); + } s_as_t; -struct s_routing_global { +struct s_routing_platf { AS_t root; void *loopback; - size_t size_of_link; 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); +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(route_t route); // FIXME rename to routing_route_free +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_get_route_and_latency(network_element_t src, network_element_t dst, +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 */ -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);