X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66f9d7f18e9a5f08bbcc381381283895ab6a0a89..17a9f17337b1d6743025cf52e7c19a469138d38f:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 80ba539e1d..568ded5760 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -17,19 +17,6 @@ #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; -extern int sg_maxmin_selective_update; -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]; @@ -100,11 +87,10 @@ void generic_update_actions_state_full(double now, double delta, surf_model_t mo FILE *surf_fopen(const char *name, const char *mode); extern tmgr_history_t history; -extern xbt_dynar_t surf_path; -void surf_config_init(int *argc, char **argv); -void surf_config_finalize(void); -void surf_config(const char *name, va_list pa); +//void surf_config_init(int *argc, char **argv); +//void surf_config_finalize(void); +//void surf_config(const char *name, va_list pa); void net_action_recycle(surf_action_t action); double net_action_get_remains(surf_action_t action); @@ -112,14 +98,6 @@ double net_action_get_remains(surf_action_t action); int net_get_link_latency_limited(surf_action_t action); #endif -/* - * Returns the initial path. On Windows the initial path is - * the current directory for the current process in the other - * case the function returns "./" that represents the current - * directory on Unix/Linux platforms. - */ -const char *__surf_get_initial_path(void); - /* The __surf_is_absolute_file_path() returns 1 if * file_path is a absolute file path, in the other * case the function returns 0. @@ -132,7 +110,7 @@ typedef struct s_routing_edge { 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 @@ -188,6 +166,7 @@ typedef struct s_as { 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_platf { @@ -200,6 +179,11 @@ struct s_routing_platf { XBT_PUBLIC(void) routing_model_create(void *loopback); XBT_PUBLIC(void) routing_exit(void); XBT_PUBLIC(void) storage_register_callbacks(void); +/* ***************************************** */ +/* TUTORIAL: New TAG */ +XBT_PUBLIC(void) gpu_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? @@ -211,8 +195,6 @@ XBT_PUBLIC(void) routing_get_route_and_latency(sg_routing_edge_t src, sg_routing /** * 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);