X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/010ea2bb6479947b8488541f925d8cda99fc72af..792ee50ee3c72fbd12a6693dda4b5792844b50ab:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index a52ff94aff..54156f3126 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -17,14 +17,10 @@ #define NO_MAX_DURATION -1.0 extern double sg_tcp_gamma; +extern int sg_maxmin_selective_update; extern const char *surf_action_state_names[6]; -typedef enum { - SURF_LINK_ON = 1, /* Ready */ - SURF_LINK_OFF = 0 /* Running */ -} e_surf_link_state_t; - typedef enum { SURF_LINK_SHARED = 1, SURF_LINK_FATPIPE = 0 @@ -42,12 +38,6 @@ typedef struct surf_model_private { void (*finalize) (void); } s_surf_model_private_t; -/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */ -/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_private_part)))) */ - -extern int use_sdp_solver; -extern int use_lagrange_solver; - double generic_maxmin_share_resources(xbt_swag_t running_actions, size_t offset, lmm_system_t sys, @@ -95,6 +85,7 @@ struct s_routing { xbt_dynar_t (*get_route)(int src, int dst); void (*finalize)(void); int host_count; + int router_count; }; XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback); @@ -104,4 +95,9 @@ XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback); */ XBT_PUBLIC(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); +XBT_PUBLIC_DATA(int) surfxml_bufferstack_size; + + #endif /* _SURF_SURF_PRIVATE_H */