#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];
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);
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.
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
void (*end) (AS_t as);
} s_routing_model_description_t, *routing_model_description_t;
-typedef struct s_route {
- xbt_dynar_t link_list;
- sg_routing_edge_t src_gateway;
- sg_routing_edge_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 */
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;
sg_routing_edge_t net_elem;
xbt_dynar_t link_up_down_list;
- void (*get_route_and_latency) (AS_t as, sg_routing_edge_t src, sg_routing_edge_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, sg_routing_edge_t src, sg_routing_edge_t dst, double *lat);
+ 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);
* Of course, only the routing model of this AS is informed, not every ones */
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, 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);
+ 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 {
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(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?
/**
* 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);
XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
+/********** Tracing **********/
+/* from surf_instr.c */
+void TRACE_surf_host_set_power(double date, const char *resource, double power);
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
+void TRACE_surf_link_set_latency(double date, const char *resource, double latency);
+
+
#endif /* _SURF_SURF_PRIVATE_H */
