X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/919edbcd087b9ad979957ea49c05d1453bab8e69..211acce5bb9cf1a60e14cab26b54367028474d79:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index fe5fbc443d..026ab2f58f 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -12,12 +12,13 @@ #include "xbt/log.h" #include "surf/surfxml_parse_private.h" #include "surf/random_mgr.h" -#include "instr/private.h" +#include "instr/instr_private.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 +50,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 */ @@ -197,7 +200,7 @@ struct s_routing_global { xbt_dynar_t last_route; }; -XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_pvoid_t get_link_latency_fun); +XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun); /** * Resource protected methods