int COORD_ASR_LEVEL; //Coordinates level
int NS3_ASR_LEVEL; //host node for ns3
-static xbt_dict_t patterns = NULL;
static xbt_dict_t random_value = NULL;
/* Global vars */
routing_global_t global_routing = NULL;
AS_t current_routing = NULL;
-routing_model_description_t current_routing_model = NULL;
/* global parse functions */
xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
"Reading a host, processing unit \"%s\" already exists", host->id);
- (*(current_routing->parse_PU)) (current_routing, host->id);
+ current_routing->parse_PU(current_routing, host->id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
"Reading a router, processing unit \"%s\" already exists",
router->id);
- (*(current_routing->parse_PU)) (current_routing, router->id);
+ current_routing->parse_PU(current_routing, router->id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
- (*(current_routing->parse_route)) (current_routing, src, dst, route);
+ current_routing->parse_route(current_routing, src, dst, route);
link_list = NULL;
src = NULL;
dst = NULL;
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
- (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route);
+ current_routing->parse_ASroute(current_routing, src, dst, e_route);
link_list = NULL;
src = NULL;
dst = NULL;
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
- (*(current_routing->parse_bypassroute)) (current_routing, src, dst, e_route);
+ current_routing->parse_bypassroute(current_routing, src, dst, e_route);
link_list = NULL;
src = NULL;
dst = NULL;
*/
void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
{
- AS_t new_routing;
+ AS_t new_as;
routing_model_description_t model = NULL;
int cpt;
}
/* make a new routing component */
- new_routing = (AS_t) (*(model->create)) ();
- new_routing->routing = model;
- new_routing->hierarchy = SURF_ROUTING_NULL;
- new_routing->name = xbt_strdup(AS_id);
- new_routing->routing_sons = xbt_dict_new();
+ new_as = (AS_t) model->create();
+ new_as->model_desc = model;
+ new_as->hierarchy = SURF_ROUTING_NULL;
+ new_as->name = xbt_strdup(AS_id);
if (current_routing == NULL && global_routing->root == NULL) {
/* it is the first one */
- new_routing->routing_father = NULL;
- global_routing->root = new_routing;
+ new_as->routing_father = NULL;
+ global_routing->root = new_as;
} else if (current_routing != NULL && global_routing->root != NULL) {
(current_routing->routing_sons, AS_id),
"The AS \"%s\" already exists", AS_id);
/* it is a part of the tree */
- new_routing->routing_father = current_routing;
+ new_as->routing_father = current_routing;
/* set the father behavior */
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
xbt_dict_set(current_routing->routing_sons, AS_id,
- (void *) new_routing, NULL);
+ (void *) new_as, NULL);
/* add to the father element list */
- (*(current_routing->parse_AS)) (current_routing, AS_id);
+ current_routing->parse_AS(current_routing, AS_id);
} else {
THROWF(arg_error, 0, "All defined components must be belong to a AS");
}
/* set the new current component of the tree */
- current_routing = new_routing;
+ current_routing = new_as;
}
/**
xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL,
(void *) info);
- if (current_routing->routing->end)
- (*(current_routing->routing->end)) ();
+ if (current_routing->model_desc->end)
+ current_routing->model_desc->end(current_routing);
current_routing = current_routing->routing_father;
}
}
static void get_route_latency(const char *src, const char *dst,
xbt_dynar_t * route, double *latency, int cleanup)
{
+ static xbt_dynar_t last_route = NULL;
+
_get_route_latency(src, dst, route, latency);
xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
xbt_assert(!latency || *latency >= 0.0,
"latency error on route between \"%s\" and \"%s\"", src, dst);
if (route) {
- xbt_dynar_free(&global_routing->last_route);
- global_routing->last_route = cleanup ? *route : NULL;
+ xbt_dynar_free(&last_route);
+ last_route = cleanup ? *route : NULL;
}
}
/**
- * \brief Generic method: find a route between hosts
+ * \brief Find a route between hosts
*
* \param src the source host name
* \param dst the destination host name
* by calling the differents "get_route" functions in each routing component.
* No need to free the returned dynar. It will be freed at the next call.
*/
-static xbt_dynar_t get_route(const char *src, const char *dst)
-{
+xbt_dynar_t routing_get_route(const char *src, const char *dst) {
xbt_dynar_t route = NULL;
get_route_latency(src, dst, &route, NULL, 1);
return route;
}
-/**
- * \brief Generic method: find a route between hosts
- *
- * \param src the source host name
- * \param dst the destination host name
- *
- * same as get_route, but return NULL if any exception is raised.
- */
-static xbt_dynar_t get_route_or_null(const char *src, const char *dst)
-{
- xbt_dynar_t route = NULL;
- xbt_ex_t exception;
- TRY {
- get_route_latency(src, dst, &route, NULL, 1);
- } CATCH(exception) {
- xbt_ex_free(exception);
- return NULL;
- }
- return route;
-}
-
/**
* \brief Generic method: find a route between hosts
*
return route;
}
-/*Get Latency*/
-static double get_latency(const char *src, const char *dst)
-{
- double latency = -1.0;
- get_route_latency(src, dst, NULL, &latency, 0);
- return latency;
-}
-
-/**
- * \brief Recursive function for finalize
- *
- * \param rc the source host name
- *
- * This fuction is call by "finalize". It allow to finalize the
- * AS or routing components. It delete all the structures.
- */
-static void finalize_rec(AS_t as)
-{
- if (as) {
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- AS_t elem;
- xbt_dict_foreach(as->routing_sons, cursor, key, elem)
- finalize_rec(elem);
-
- xbt_dict_t tmp_sons = as->routing_sons;
- char *tmp_name = as->name;
- xbt_dict_free(&tmp_sons);
- xbt_free(tmp_name);
- as->finalize(as);
- }
-}
-
-/**
- * \brief Generic method: delete all the routing structures
- *
- * walk through the routing components tree and delete the structures
- * by calling the different "finalize" functions in each routing component
- */
-static void finalize(void)
-{
- /* delete recursively all the tree */
- finalize_rec(global_routing->root);
- /* delete last_route */
- xbt_dynar_free(&(global_routing->last_route));
- /* delete global routing structure */
- xbt_free(global_routing);
-}
-
static xbt_dynar_t recursive_get_onelink_routes(AS_t rc)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
return recursive_get_onelink_routes(global_routing->root);
}
-e_surf_network_element_type_t get_network_element_type(const char *name)
+e_surf_network_element_type_t routing_get_network_element_type(const char *name)
{
network_element_info_t rc = NULL;
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
global_routing->root = NULL;
- global_routing->get_route = get_route;
- global_routing->get_route_or_null = get_route_or_null;
- global_routing->get_latency = get_latency;
global_routing->get_route_no_cleanup = get_route_no_cleanup;
global_routing->get_onelink_routes = get_onelink_routes;
global_routing->get_route_latency = get_route_latency;
- global_routing->get_network_element_type = get_network_element_type;
- global_routing->finalize = finalize;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
- global_routing->last_route = NULL;
/* no current routing at moment */
current_routing = NULL;
}
static void routing_parse_cluster(void)
{
char *host_id, *groups, *link_id = NULL;
+ xbt_dict_t patterns = NULL;
s_sg_platf_host_cbarg_t host;
s_sg_platf_link_cbarg_t link;
+ unsigned int iter;
+ int start, end, i;
+ xbt_dynar_t radical_elements;
+ xbt_dynar_t radical_ends;
+
if (strcmp(struct_cluster->availability_trace, "")
|| strcmp(struct_cluster->state_trace, "")) {
- if (xbt_dict_size(patterns) == 0)
- patterns = xbt_dict_new();
+ patterns = xbt_dict_new();
xbt_dict_set(patterns, "id", xbt_strdup(struct_cluster->id), free);
xbt_dict_set(patterns, "prefix", xbt_strdup(struct_cluster->prefix), free);
xbt_dict_set(patterns, "suffix", xbt_strdup(struct_cluster->suffix), free);
}
- unsigned int iter;
- int start, end, i;
- xbt_dynar_t radical_elements;
- xbt_dynar_t radical_ends;
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", struct_cluster->id);
sg_platf_new_AS_begin(struct_cluster->id, "Cluster");
//Make all hosts
radical_elements = xbt_str_split(struct_cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
- memset(&host, 0, sizeof(host));
radical_ends = xbt_str_split(groups, "-");
start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix);
link_id = bprintf("%s_link_%d", struct_cluster->id, i);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id,
- struct_cluster->power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->power);
+
+ memset(&host, 0, sizeof(host));
host.id = host_id;
if (strcmp(struct_cluster->availability_trace, "")) {
xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
- char *tmp_availability_file =
- xbt_strdup(struct_cluster->availability_trace);
- xbt_str_varsubst(tmp_availability_file, patterns);
- XBT_DEBUG("\tavailability_file=\"%s\"", tmp_availability_file);
- host.power_trace = tmgr_trace_new(tmp_availability_file);
- xbt_free(tmp_availability_file);
+ char *avail_file = xbt_str_varsubst(struct_cluster->availability_trace, patterns);
+ XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
+ host.power_trace = tmgr_trace_new(avail_file);
+ xbt_free(avail_file);
} else {
XBT_DEBUG("\tavailability_file=\"\"");
}
+
if (strcmp(struct_cluster->state_trace, "")) {
- char *tmp_state_file = xbt_strdup(struct_cluster->state_trace);
- xbt_str_varsubst(tmp_state_file, patterns);
- XBT_DEBUG("\tstate_file=\"%s\"", tmp_state_file);
- host.state_trace = tmgr_trace_new(tmp_state_file);
- xbt_free(tmp_state_file);
+ char *avail_file = xbt_str_varsubst(struct_cluster->state_trace, patterns);
+ XBT_DEBUG("\tstate_file=\"%s\"", avail_file);
+ host.state_trace = tmgr_trace_new(avail_file);
+ xbt_free(avail_file);
} else {
XBT_DEBUG("\tstate_file=\"\"");
}
}
xbt_dynar_free(&radical_elements);
- // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together
+ // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
+ // and it's very useful to connect clusters together
XBT_DEBUG(" ");
XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->router_id);
- s_sg_platf_router_cbarg_t router;
char *newid = NULL;
+ s_sg_platf_router_cbarg_t router;
memset(&router, 0, sizeof(router));
router.id = struct_cluster->router_id;
router.coord = "";
sg_platf_new_link(&link);
- surf_parsing_link_up_down_t info =
- xbt_new0(s_surf_parsing_link_up_down_t, 1);
- info->link_up =
- xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
- info->link_down = info->link_up;
- surf_routing_cluster_add_link(struct_cluster->id, info);
+ surf_routing_cluster_add_backbone(current_routing, xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL));
free(link_backbone);
}
- XBT_DEBUG(" ");
-
- char *new_suffix = xbt_strdup("");
-
- radical_elements = xbt_str_split(struct_cluster->suffix, ".");
- xbt_dynar_foreach(radical_elements, iter, groups) {
- if (strcmp(groups, "")) {
- char *old_suffix = new_suffix;
- new_suffix = bprintf("%s\\.%s", old_suffix, groups);
- free(old_suffix);
- }
- }
-
- xbt_dynar_free(&radical_elements);
- xbt_free(new_suffix);
-
- if (strcmp(struct_cluster->availability_trace, "")
- || strcmp(struct_cluster->state_trace, ""))
- xbt_dict_free(&patterns);
-
XBT_DEBUG("</AS>");
sg_platf_new_AS_end();
XBT_DEBUG(" ");
+ xbt_dict_free(&patterns); // no op if it were never set
}
-static void routing_parse_postparse(void)
-{
+static void routing_parse_postparse(void) {
xbt_dict_free(&random_value);
- xbt_dict_free(&patterns);
}
static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
instr_routing_define_callbacks();
#endif
}
+
+/**
+ * \brief Recursive function for finalize
+ *
+ * \param rc the source host name
+ *
+ * This fuction is call by "finalize". It allow to finalize the
+ * AS or routing components. It delete all the structures.
+ */
+static void finalize_rec(AS_t as) {
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ AS_t elem;
+
+ xbt_dict_foreach(as->routing_sons, cursor, key, elem) {
+ finalize_rec(elem);
+ }
+
+ as->finalize(as);
+}
+
+/** \brief Frees all memory allocated by the routing module */
+void routing_exit(void) {
+ if (!global_routing)
+ return;
+ finalize_rec(global_routing->root);
+ xbt_free(global_routing);
+}
