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(surf_action_t action);
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
* One link routing list
*/
typedef struct {
- int src_id;
- int dst_id;
+ char *src;
+ char *dst;
void *link_ptr;
}s_onelink, *s_onelink_t;
-
-/*
+/**
* Routing logic
*/
-// FIXME: the next lines cant be comented without fix the code in network.c file.
-// struct s_routing {
-// const char *name;
-// xbt_dict_t host_id; /* char* -> int* */
-// xbt_dynar_t (*get_route)(int src, int dst);
-// xbt_dict_t (*get_onelink_routes)(void);
-// int (*is_router)(int id);
-// void (*finalize)(void);
-// int host_count;
-// int router_count;
-// };
-
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW STRUCTURES
-////////////////////////////////////////////////////////////////////////////////
-
typedef enum {
SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */
SURF_NETWORK_ELEMENT_HOST, /* host type */
char* dst_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_BASE, /**< Base case: use simple link lists for routing */
+ SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */
+} e_surf_routing_hierarchy_t;
+
struct s_routing_component {
model_type_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);
- xbt_dict_t (*get_network_elements)(routing_component_t rc, e_surf_network_element_type_t type);
+ 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, const char* dst, route_t route);
+ void (*set_ASroute)(routing_component_t rc, const char* src, const char* dst, route_extended_t route);
+ void (*set_bypassroute)(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
};
struct s_routing_global {
void *loopback;
size_t size_of_link;
xbt_dynar_t (*get_route)(const char* src, const char* dst);
+ xbt_dict_t (*get_onelink_routes)(void);
+ int (*is_router)(const char *name);
void (*finalize)(void);
xbt_dynar_t last_route;
};
XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
-////////////////////////////////////////////////////////////////////////////////
-// HERE END THE NEW STRUCTURES
-////////////////////////////////////////////////////////////////////////////////
-
-/*
+/**
* Resource protected methods
*/
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;
+XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
#endif /* _SURF_SURF_PRIVATE_H */