#include "surf/maxmin.h"
#include "surf/trace_mgr.h"
#include "xbt/log.h"
-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"
#include "surf/random_mgr.h"
#include "instr/instr_private.h"
#include "surf/surfxml_parse_values.h"
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;
void surf_action_state_set(surf_action_t action,
e_surf_action_state_t state);
void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */
+
+void surf_action_lmm_update_index_heap(void *action, int i); /* callback for heap management shared by cpu and net models */
+void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action,
+ double key, enum heap_action_type hat);
+void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
+
+
FILE *surf_fopen(const char *name, const char *mode);
extern tmgr_history_t history;
*/
int __surf_is_absolute_file_path(const char *file_path);
+typedef struct s_as *AS_t;
+typedef struct s_routing_edge {
+ AS_t rc_component;
+ e_surf_network_element_type_t rc_type;
+ int id;
+ char *name;
+} s_network_element_t;
+
/*
- * One link routing list
+ * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3
*/
typedef struct s_onelink {
- char *src;
- char *dst;
+ sg_routing_edge_t src;
+ sg_routing_edge_t dst;
void *link_ptr;
} s_onelink_t, *onelink_t;
/**
* Routing logic
*/
-typedef struct s_as *AS_t;
typedef struct s_model_type {
const char *name;
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;
-typedef struct s_route_extended {
- s_route_t generic_route;
- char *src_gateway;
- char *dst_gateway;
-} s_route_extended_t, *route_extended_t;
-
/* This enum used in the routing structure helps knowing in which situation we are. */
typedef enum {
SURF_ROUTING_NULL = 0, /**< Undefined type */
} e_surf_routing_hierarchy_t;
typedef struct s_as {
- xbt_dict_t to_index; /* char* -> network_element_t */
+ xbt_dynar_t index_network_elm;
xbt_dict_t bypassRoutes; /* store bypass routes */
- routing_model_description_t routing;
+ routing_model_description_t model_desc;
e_surf_routing_hierarchy_t hierarchy;
char *name;
struct s_as *routing_father;
xbt_dict_t routing_sons;
- route_extended_t(*get_route) (AS_t as, const char *src,
- const char *dst);
- double(*get_latency) (AS_t as, const char *src,
- const char *dst, route_extended_t e_route);
+ 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);
+
xbt_dynar_t(*get_onelink_routes) (AS_t as);
- e_surf_network_element_type_t(*get_network_element_type) (const char *name);
- route_extended_t(*get_bypass_route) (AS_t as,
- const char *src, const char *dst);
+ route_t(*get_bypass_route) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, double *lat);
void (*finalize) (AS_t as);
+
+
/* The parser calls the following functions to inform the routing models
* that a new element is added to the AS currently built.
*
* Of course, only the routing model of this AS is informed, not every ones */
- void (*parse_PU) (AS_t as, const char *name); /* A host or a router, whatever */
- void (*parse_AS) (AS_t as, const char *name);
+ 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_extended_t route);
+ const char *dst, route_t route);
void (*parse_ASroute) (AS_t as, const char *src,
- const char *dst, route_extended_t route);
+ const char *dst, route_t route);
void (*parse_bypassroute) (AS_t as, const char *src,
- const char *dst, route_extended_t e_route);
+ const char *dst, route_t e_route);
} s_as_t;
-typedef struct s_network_element_info {
- AS_t rc_component;
- e_surf_network_element_type_t rc_type;
-} s_network_element_info_t, *network_element_info_t;
-
-typedef int *network_element_t;
-
-struct s_routing_global {
+struct s_routing_platf {
AS_t root;
void *loopback;
- size_t size_of_link;
- xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
- xbt_dynar_t(*get_onelink_routes) (void);
- void (*get_route_latency)(const char *src, const char *dst,
- xbt_dynar_t *route, double *latency, int cleanup);
- e_surf_network_element_type_t(*get_network_element_type) (const char *name);
xbt_dynar_t last_route;
+ xbt_dynar_t(*get_onelink_routes) (void);
};
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
+XBT_PUBLIC(void) routing_model_create(void *loopback);
XBT_PUBLIC(void) routing_exit(void);
+XBT_PUBLIC(void) storage_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
+ // FIXME: make previous function private to routing again?
+
-XBT_PUBLIC(xbt_dynar_t) routing_get_route(const char *src, const char *dst);
+XBT_PUBLIC(void) routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
+ xbt_dynar_t * route, double *latency);
/**
* Resource protected methods
