#include "surf/surfxml_parse_private.h"
#include "surf/random_mgr.h"
#include "instr/instr_private.h"
+#include "surf/surfxml_parse_values.h"
#define NO_MAX_DURATION -1.0
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 */
/**
* Routing logic
*/
+typedef struct s_routing_component *routing_component_t;
typedef struct s_model_type {
const char *name;
const char *desc;
- void *(*create) ();
- void (*load) ();
- void (*unload) ();
+ routing_component_t (*create) ();
void (*end) ();
-} s_model_type_t, *model_type_t;
+} s_routing_model_description_t, *routing_model_description_t;
typedef struct s_route {
xbt_dynar_t link_list;
} s_route_t, *route_t;
-typedef struct s_name_route {
- xbt_dynar_t link_name_list;
-} s_name_route_t, *name_route_t;
-
typedef struct s_name_route_extended {
s_route_t generic_route;
char *src_gateway;
char *dst_gateway;
} s_name_route_extended_t, *name_route_extended_t;
-typedef struct s_route_limits {
- char *src_gateway;
- char *dst_gateway;
-} s_route_limits_t, *route_limits_t;
-
typedef struct s_route_extended {
s_route_t generic_route;
char *src_gateway;
/* This enum used in the routing structure helps knowing in which situation we are. */
typedef enum {
- SURF_ROUTING_NULL = 0, /**< Indefined type */
+ SURF_ROUTING_NULL = 0, /**< Undefined type */
SURF_ROUTING_BASE, /**< Base case: use simple link lists for routing */
SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */
} e_surf_routing_hierarchy_t;
-typedef enum {
- SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */
- SURF_NETWORK_ELEMENT_HOST, /* host type */
- SURF_NETWORK_ELEMENT_ROUTER, /* router type */
- SURF_NETWORK_ELEMENT_AS, /* AS type */
-} e_surf_network_element_type_t;
-
-typedef struct s_routing_component *routing_component_t;
typedef struct s_routing_component {
xbt_dict_t to_index; /* char* -> network_element_t */
xbt_dict_t bypassRoutes; /* store bypass routes */
- model_type_t routing;
+ routing_model_description_t routing;
e_surf_routing_hierarchy_t hierarchy;
char *name;
struct s_routing_component *routing_father;
xbt_dict_t routing_sons;
- route_extended_t(*get_route) (routing_component_t rc, const char *src,
- const char *dst);
- double(*get_latency) (routing_component_t rc, const char *src,
- const char *dst);
- xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
- e_surf_network_element_type_t(*get_network_element_type) (const char
- *name);
- route_extended_t(*get_bypass_route) (routing_component_t rc,
- const char *src, const char *dst);
+ route_extended_t(*get_route) (routing_component_t rc, const char *src,
+ const char *dst);
+ double(*get_latency) (routing_component_t rc, const char *src,
+ const char *dst, route_extended_t e_route);
+ xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
+ e_surf_network_element_type_t(*get_network_element_type) (const char *name);
+ route_extended_t(*get_bypass_route) (routing_component_t rc,
+ const char *src, const char *dst);
void (*finalize) (routing_component_t rc);
- void (*set_processing_unit) (routing_component_t rc, const char *name);
- void (*set_autonomous_system) (routing_component_t rc, const char *name);
- void (*set_route) (routing_component_t rc, const char *src,
+ /* 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) (routing_component_t rc, const char *name); /* A host or a router, whatever */
+ void (*parse_AS) (routing_component_t rc, const char *name);
+ void (*parse_route) (routing_component_t rc, const char *src,
const char *dst, name_route_extended_t route);
- void (*set_ASroute) (routing_component_t rc, const char *src,
+ void (*parse_ASroute) (routing_component_t rc, const char *src,
const char *dst, name_route_extended_t route);
- void (*set_bypassroute) (routing_component_t rc, const char *src,
+ void (*parse_bypassroute) (routing_component_t rc, const char *src,
const char *dst, route_extended_t e_route);
} s_routing_component_t;
struct s_routing_global {
routing_component_t root;
- xbt_dict_t where_network_elements; /* char* -> network_element_info_t */
void *loopback;
size_t size_of_link;
- xbt_dynar_t(*get_route) (const char *src, const char *dst);
- xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
- xbt_dynar_t(*get_onelink_routes) (void);
- double (*get_latency) (const char *src, const char *dst);
- e_surf_network_element_type_t(*get_network_element_type) (const char
- *name);
+ xbt_dynar_t(*get_route) (const char *src, const char *dst);
+ xbt_dynar_t(*get_route_or_null) (const char *src, const char *dst);
+ xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
+ xbt_dynar_t(*get_onelink_routes) (void);
+ double (*get_latency) (const char *src, const char *dst);
+ 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);
void (*finalize) (void);
xbt_dynar_t last_route;
};
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
+XBT_PUBLIC(void) routing_register_callbacks(void);
/**
* Resource protected methods
*/
-xbt_dict_t surf_resource_properties(const void *resource);
+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);
