AS_t current_routing = NULL;
/* global parse functions */
-xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */
extern xbt_dynar_t mount_list;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
static void parse_E_route(sg_platf_route_cbarg_t route)
{
route_t created_route = xbt_new0(s_route_t, 1);
- created_route->link_list = parsed_link_list;
+ created_route->link_list = route->link_list;
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->parse_route(current_routing,
route->src, route->dst, created_route);
generic_free_route(created_route);
- parsed_link_list = NULL;
}
/**
* \brief Store the ASroute by calling the set_ASroute function of the current routing component
*/
-static void parse_E_ASroute(sg_platf_ASroute_cbarg_t ASroute)
+static void parse_E_ASroute(sg_platf_route_cbarg_t ASroute)
{
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = parsed_link_list;
-
- if (!strcmp(current_routing->model_desc->name,"RuleBased")) {
- // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields
- // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows)
- //
- // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity
- e_route->src_gateway = (sg_routing_edge_t) ASroute->gw_src;
- e_route->dst_gateway = (sg_routing_edge_t) ASroute->gw_dst;
- } else {
- e_route->src_gateway = sg_routing_edge_by_name_or_null(ASroute->gw_src);
- e_route->dst_gateway = sg_routing_edge_by_name_or_null(ASroute->gw_dst);
- }
+ e_route->link_list = ASroute->link_list;
+ e_route->src_gateway = ASroute->gw_src;
+ e_route->dst_gateway = ASroute->gw_dst;
+
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
current_routing->parse_ASroute(current_routing, ASroute->src, ASroute->dst, e_route);
generic_free_route(e_route);
- parsed_link_list = NULL;
}
/**
* \brief Store the bypass route by calling the set_bypassroute function of the current routing component
*/
-static void parse_E_bypassRoute(sg_platf_bypassRoute_cbarg_t route)
+static void parse_E_bypassRoute(sg_platf_route_cbarg_t route)
{
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = parsed_link_list;
+ e_route->link_list = route->link_list;
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
current_routing->parse_bypassroute(current_routing, route->src, route->dst, e_route);
- parsed_link_list = NULL;
}
/**
* \brief Store the bypass route by calling the set_bypassroute function of the current routing component
*/
-static void parse_E_bypassASroute(sg_platf_bypassASroute_cbarg_t ASroute)
+static void parse_E_bypassASroute(sg_platf_route_cbarg_t ASroute)
{
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = parsed_link_list;
- e_route->src_gateway = sg_routing_edge_by_name_or_null(ASroute->gw_src);
- e_route->dst_gateway = sg_routing_edge_by_name_or_null(ASroute->gw_dst);
+ e_route->link_list = ASroute->link_list;
+ e_route->src_gateway = ASroute->gw_src;
+ e_route->dst_gateway = ASroute->gw_dst;
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
current_routing->parse_bypassroute(current_routing, ASroute->src, ASroute->dst, e_route);
- parsed_link_list = NULL;
}
-/**
- * \brief Set a new link on the actual list of link for a route or ASroute from XML
- */
+static void routing_parse_trace(sg_platf_trace_cbarg_t trace)
+{
+ tmgr_trace_t tmgr_trace;
+ if (!trace->file || strcmp(trace->file, "") != 0) {
+ tmgr_trace = tmgr_trace_new_from_file(trace->file);
+ } else if (strcmp(trace->pc_data, "") == 0) {
+ tmgr_trace = NULL;
+ } else {
+ tmgr_trace =
+ tmgr_trace_new_from_string(trace->id, trace->pc_data,
+ trace->periodicity);
+ }
+ xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
+}
-static void routing_parse_link_ctn(sg_platf_linkctn_cbarg_t linkctn)
+static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
{
- char *link_id;
- switch (linkctn->direction) {
- case SURF_LINK_DIRECTION_NONE:
- link_id = xbt_strdup(linkctn->id);
+ xbt_assert(xbt_dict_get_or_null
+ (traces_set_list, trace_connect->trace),
+ "Cannot connect trace %s to %s: trace unknown",
+ trace_connect->trace,
+ trace_connect->element);
+
+ switch (trace_connect->kind) {
+ case SURF_TRACE_CONNECT_KIND_HOST_AVAIL:
+ xbt_dict_set(trace_connect_list_host_avail,
+ trace_connect->trace,
+ xbt_strdup(trace_connect->element), NULL);
break;
- case SURF_LINK_DIRECTION_UP:
- link_id = bprintf("%s_UP", linkctn->id);
+ case SURF_TRACE_CONNECT_KIND_POWER:
+ xbt_dict_set(trace_connect_list_power, trace_connect->trace,
+ xbt_strdup(trace_connect->element), NULL);
break;
- case SURF_LINK_DIRECTION_DOWN:
- link_id = bprintf("%s_DOWN", linkctn->id);
+ case SURF_TRACE_CONNECT_KIND_LINK_AVAIL:
+ xbt_dict_set(trace_connect_list_link_avail,
+ trace_connect->trace,
+ xbt_strdup(trace_connect->element), NULL);
+ break;
+ case SURF_TRACE_CONNECT_KIND_BANDWIDTH:
+ xbt_dict_set(trace_connect_list_bandwidth,
+ trace_connect->trace,
+ xbt_strdup(trace_connect->element), NULL);
+ break;
+ case SURF_TRACE_CONNECT_KIND_LATENCY:
+ xbt_dict_set(trace_connect_list_latency, trace_connect->trace,
+ xbt_strdup(trace_connect->element), NULL);
+ break;
+ default:
+ xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
+ trace_connect->trace, trace_connect->element);
break;
}
-
- if(parsed_link_list == NULL)
- parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-
- xbt_dynar_push(parsed_link_list, &link_id);
}
/**
*/
void routing_AS_begin(const char *AS_id, int wanted_routing_type)
{
+ XBT_DEBUG("routing_AS_begin");
AS_t new_as;
routing_model_description_t model = NULL;
case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break;
case A_surfxml_AS_routing_RuleBased: model = &routing_models[SURF_MODEL_RULEBASED];break;
case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break;
+ default: xbt_die("Not a valid model!!!");
+ break;
}
/* make a new routing component */
sg_platf_peer_add_cb(routing_parse_peer);
sg_platf_postparse_add_cb(routing_parse_postparse);
- sg_platf_linkctn_add_cb(routing_parse_link_ctn);
-
/* we care about the ASes while parsing the platf. Incredible, isnt it? */
sg_platf_AS_end_add_cb(routing_AS_end);
sg_platf_AS_begin_add_cb(routing_AS_begin);
- surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
-
+ sg_platf_trace_add_cb(routing_parse_trace);
+ sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
