X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/725c769707a505cb0a66620ca7bfce85fe107e8e..9f4ddf3b15fccdab0f2666bf44061e7fd8305f49:/src/surf/surf_private.h?ds=sidebyside diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 4a322d05b6..bb7ee785a1 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -20,7 +20,7 @@ typedef enum { UM_FULL, UM_LAZY, - UM_UNDEFINED, + UM_UNDEFINED } e_UM_t; /* user-visible parameters */ @@ -30,7 +30,7 @@ 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; @@ -75,12 +75,12 @@ void surf_config_init(int *argc, char **argv); void surf_config_finalize(void); void surf_config(const char *name, va_list pa); -void im_net_action_recycle(surf_action_t action); -double im_net_action_get_remains(surf_action_t action); +void net_action_recycle(surf_action_t action); +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 im_net_action_set_max_duration(surf_action_t action, double duration); +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