#include <pcre.h> /* regular expression library */
#include "surf_routing_private.h"
#include "surf/surf_routing.h"
+#include "surf/surfxml_parse_values.h"
xbt_lib_t host_lib;
int ROUTING_HOST_LEVEL; //Routing level
/**
* \brief Add a "router" to the network element list
*/
-static void parse_S_router(const char *router_id)
+static void parse_S_router(void)
{
network_element_info_t info = NULL;
-
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL),
+ xbt_assert(!xbt_lib_get_or_null(as_router_lib,struct_router->V_router_id, ROUTING_ASR_LEVEL),
"Reading a router, processing unit \"%s\" already exists",
- router_id);
+ struct_router->V_router_id);
xbt_assert(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
current_routing->name);
(*(current_routing->set_processing_unit)) (current_routing,
- router_id);
+ struct_router->V_router_id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
- xbt_lib_set(as_router_lib,router_id,ROUTING_ASR_LEVEL,(void *) info);
+ xbt_lib_set(as_router_lib,struct_router->V_router_id,ROUTING_ASR_LEVEL,(void *) info);
if (strcmp(A_surfxml_router_coordinates,"")) {
if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
xbt_dynar_shrink(ctn, 0);
- xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn);
+ xbt_lib_set(as_router_lib,struct_router->V_router_id,COORD_ASR_LEVEL,(void *) ctn);
}
}
*/
static void parse_S_router_XML(void)
{
- return parse_S_router(A_surfxml_router_id);
+ return parse_S_router();
}
/**
*/
static void parse_S_router_lua(const char* router_id)
{
- return parse_S_router(router_id);
+ struct_router->V_router_id = xbt_strdup(router_id);
+ struct_router->V_router_coord = xbt_strdup("");
+ return parse_S_router();
}
/**
* make the new structure and
* set the parsing functions to allows parsing the part of the routing tree
*/
-static void parse_S_AS(char *AS_id, char *AS_routing)
+void routing_AS_init(const char *AS_id, const char *AS_routing)
{
routing_component_t new_routing;
model_type_t model = NULL;
- char *wanted = AS_routing;
+ const char *wanted = AS_routing;
int cpt;
- /* seach the routing model */
+ /* search the routing model */
for (cpt = 0; routing_models[cpt].name; cpt++)
if (!strcmp(wanted, routing_models[cpt].name))
model = &routing_models[cpt];
/*
* Detect the routing model type of the routing component from XML platforms
*/
-static void parse_S_AS_XML(void)
-{
- parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing);
-}
-
-/*
- * define the routing model type of routing component from lua script
- */
-static void parse_S_AS_lua(char *id, char *mode)
+static void parse_S_AS(void)
{
- parse_S_AS(id, mode);
+ routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
}
* When you finish to read the routing component, other structures must be created.
* the "end" method allow to do that for any routing model type
*/
-static void parse_E_AS(const char *AS_id)
+void routing_AS_end(const char *AS_id)
{
if (current_routing == NULL) {
/*
* \brief Finish the creation of a new routing component from XML
*/
-static void parse_E_AS_XML(void)
-{
- parse_E_AS(A_surfxml_AS_id);
-}
-
-/*
- * \brief Finish the creation of a new routing component from lua
- */
-static void parse_E_AS_lua(const char *id)
+static void parse_E_AS(void)
{
- parse_E_AS(id);
+ routing_AS_end(A_surfxml_AS_id);
}
/* Aux Business methods */
TRY {
get_route_latency(src, dst, &route, NULL, 1);
}CATCH(exception) {
+ xbt_ex_free(exception);
return NULL;
}
return route;
surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list,
&parse_E_bypassRoute_store_route);
- surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS_XML);
- surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
+ surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
+ surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
surfxml_add_callback(STag_surfxml_cluster_cb_list,
&routing_parse_Scluster);
void routing_parse_Scluster(void)
{
static int AX_ptr = 0;
-
- char *cluster_id = A_surfxml_cluster_id;
- char *cluster_prefix = A_surfxml_cluster_prefix;
- char *cluster_suffix = A_surfxml_cluster_suffix;
- char *cluster_radical = A_surfxml_cluster_radical;
- char *cluster_power = A_surfxml_cluster_power;
- char *cluster_core = A_surfxml_cluster_core;
- char *cluster_bw = A_surfxml_cluster_bw;
- char *cluster_lat = A_surfxml_cluster_lat;
- char *temp_cluster_bw = NULL;
- char *temp_cluster_lat = NULL;
- char *temp_cluster_power = NULL;
- char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
- char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
- char *cluster_availability_file = A_surfxml_cluster_availability_file;
- char *cluster_state_file = A_surfxml_cluster_state_file;
char *host_id, *groups, *link_id = NULL;
- char *router_id = xbt_strdup(A_surfxml_cluster_router_id);
- char *availability_file = xbt_strdup(cluster_availability_file);
- char *state_file = xbt_strdup(cluster_state_file);
+ char *availability_file = xbt_strdup(A_surfxml_cluster_availability_file);
+ char *state_file = xbt_strdup(A_surfxml_cluster_state_file);
if(xbt_dict_size(patterns)==0)
patterns = xbt_dict_new();
- xbt_dict_set(patterns,"id",cluster_id,NULL);
- xbt_dict_set(patterns,"prefix",cluster_prefix,NULL);
- xbt_dict_set(patterns,"suffix",cluster_suffix,NULL);
+ xbt_dict_set(patterns,"id",struct_cluster->V_cluster_id,NULL);
+ xbt_dict_set(patterns,"prefix",struct_cluster->V_cluster_prefix,NULL);
+ xbt_dict_set(patterns,"suffix",struct_cluster->V_cluster_suffix,NULL);
char *route_src_dst;
unsigned int iter;
surfxml_bufferstack_push(1);
- SURFXML_BUFFER_SET(AS_id, cluster_id);
+ SURFXML_BUFFER_SET(AS_id, struct_cluster->V_cluster_id);
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", struct_cluster->V_cluster_id);
SURFXML_START_TAG(AS);
- radical_elements = xbt_str_split(cluster_radical, ",");
+ radical_elements = xbt_str_split(struct_cluster->V_cluster_radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
radical_ends = xbt_str_split(groups, "-");
switch (xbt_dynar_length(radical_ends)) {
case 1:
- surf_parse_get_int(&start,
- xbt_dynar_get_as(radical_ends, 0, char *));
- host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
- link_id = bprintf("%s_link_%d", cluster_id, start);
-
+ surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
+ host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix);
+ link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start);
xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
- temp_cluster_power = xbt_strdup(cluster_power);
- temp_cluster_power = replace_random_parameter(temp_cluster_power);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
A_surfxml_host_state = A_surfxml_host_state_ON;
+
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, struct_cluster->S_cluster_power);
SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, temp_cluster_power);
- SURFXML_BUFFER_SET(host_core, cluster_core);
+ SURFXML_BUFFER_SET(host_power, struct_cluster->S_cluster_power);
+
+ if(!strcmp(A_surfxml_cluster_availability_file,"")){
+ char* tmp_availability_file = xbt_strdup(availability_file);
+ xbt_str_varsubst(tmp_availability_file,patterns);
+ XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+ SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
+ xbt_free(tmp_availability_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tavailability_file=\"\"");
+ SURFXML_BUFFER_SET(host_availability_file, "");
+ }
+ if(!strcmp(A_surfxml_cluster_state_file,"")){
+ char *tmp_state_file = xbt_strdup(state_file);
+ xbt_str_varsubst(tmp_state_file,patterns);
+ XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+ SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
+ xbt_free(tmp_state_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tstate_file=\"\"");
+ SURFXML_BUFFER_SET(host_state_file, "");
+ }
+
+ SURFXML_BUFFER_SET(host_core, struct_cluster->S_cluster_core);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_coordinates, "");
- xbt_free(availability_file);
- availability_file = xbt_strdup(cluster_availability_file);
- xbt_free(state_file);
- state_file = xbt_strdup(cluster_state_file);
- XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
- XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
- SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
- SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
- XBT_DEBUG("</host>");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
+ XBT_DEBUG("</host>");
-
- temp_cluster_bw = xbt_strdup(cluster_bw);
- temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
- temp_cluster_lat = xbt_strdup(cluster_lat);
- temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
+
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
SURFXML_BUFFER_SET(link_id, link_id);
- SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
- SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
+ SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bw);
+ SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- xbt_free(temp_cluster_bw);
- xbt_free(temp_cluster_lat);
- xbt_free(temp_cluster_power);
free(link_id);
free(host_id);
break;
xbt_dynar_get_as(radical_ends, 0, char *));
surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
for (i = start; i <= end; i++) {
- host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
- link_id = bprintf("%s_link_%d", cluster_id, i);
-
- xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
- temp_cluster_power = xbt_strdup(cluster_power);
- temp_cluster_power = replace_random_parameter(temp_cluster_power);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
- A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, temp_cluster_power);
- SURFXML_BUFFER_SET(host_core, cluster_core);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_coordinates, "");
- xbt_free(availability_file);
- availability_file = xbt_strdup(cluster_availability_file);
- xbt_free(state_file);
- state_file = xbt_strdup(cluster_state_file);
- XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
- XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
- SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
- SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
- XBT_DEBUG("</host>");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
-
- xbt_free(temp_cluster_power);
-
- temp_cluster_bw = xbt_strdup(cluster_bw);
- temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
- temp_cluster_lat = xbt_strdup(cluster_lat);
- temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
- SURFXML_BUFFER_SET(link_id, link_id);
- SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw);
- SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
-
- xbt_free(temp_cluster_bw);
- xbt_free(temp_cluster_lat);
- free(link_id);
- free(host_id);
+ host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix);
+ link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i);
+ xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+ A_surfxml_host_state = A_surfxml_host_state_ON;
+
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, struct_cluster->S_cluster_power);
+ SURFXML_BUFFER_SET(host_id, host_id);
+ SURFXML_BUFFER_SET(host_power, struct_cluster->S_cluster_power);
+
+ if(!strcmp(A_surfxml_cluster_availability_file,"")){
+ char* tmp_availability_file = xbt_strdup(availability_file);
+ xbt_str_varsubst(tmp_availability_file,patterns);
+ XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+ SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
+ xbt_free(tmp_availability_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tavailability_file=\"\"");
+ SURFXML_BUFFER_SET(host_availability_file, "");
+ }
+ if(!strcmp(A_surfxml_cluster_state_file,"")){
+ char *tmp_state_file = xbt_strdup(state_file);
+ xbt_str_varsubst(tmp_state_file,patterns);
+ XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+ SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
+ xbt_free(tmp_state_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tstate_file=\"\"");
+ SURFXML_BUFFER_SET(host_state_file, "");
+ }
+
+ SURFXML_BUFFER_SET(host_core, struct_cluster->S_cluster_core);
+ SURFXML_BUFFER_SET(host_availability, "1.0");
+ SURFXML_BUFFER_SET(host_coordinates, "");
+ SURFXML_START_TAG(host);
+ SURFXML_END_TAG(host);
+ XBT_DEBUG("</host>");
+
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
+
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
+
+ SURFXML_BUFFER_SET(link_id, link_id);
+ SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bw);
+ SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_lat);
+ SURFXML_BUFFER_SET(link_bandwidth_file, "");
+ SURFXML_BUFFER_SET(link_latency_file, "");
+ SURFXML_BUFFER_SET(link_state_file, "");
+ SURFXML_START_TAG(link);
+ SURFXML_END_TAG(link);
+
+ free(link_id);
+ free(host_id);
}
break;
default:
XBT_DEBUG("Malformed radical");
+ break;
}
xbt_dynar_free(&radical_ends);
xbt_dynar_free(&radical_elements);
XBT_DEBUG(" ");
- if(!strcmp(router_id,""))
- router_id = bprintf("%s%s_router%s", cluster_prefix, cluster_id, cluster_suffix);
-
- XBT_DEBUG("<router id=\"%s\"/>", router_id);
- SURFXML_BUFFER_SET(router_id, router_id);
+ XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->S_cluster_router_id);
+ SURFXML_BUFFER_SET(router_id, struct_cluster->S_cluster_router_id);
SURFXML_BUFFER_SET(router_coordinates, "");
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
- char *link_backbone = bprintf("%s_backbone", cluster_id);
- XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_lat);
+ if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
+ char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_backbone);
- SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
- SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
+ SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bb_bw);
+ SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_bb_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
char *new_suffix = xbt_strdup("");
- radical_elements = xbt_str_split(cluster_suffix, ".");
+ radical_elements = xbt_str_split(struct_cluster->V_cluster_suffix, ".");
xbt_dynar_foreach(radical_elements, iter, groups) {
if (strcmp(groups, "")) {
char *old_suffix = new_suffix;
free(old_suffix);
}
}
- route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
+ route_src_dst = bprintf("%s(.*)%s", struct_cluster->V_cluster_prefix, new_suffix);
xbt_dynar_free(&radical_elements);
- free(new_suffix);
+ xbt_free(new_suffix);
- char *pcre_link_src = bprintf("%s_link_$1src", cluster_id);
- char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
- char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
+ char *pcre_link_src = bprintf("%s_link_$1src", struct_cluster->V_cluster_id);
+ char *pcre_link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
+ char *pcre_link_dst = bprintf("%s_link_$1dst", struct_cluster->V_cluster_id);
//from router to router
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, router_id);
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", struct_cluster->S_cluster_router_id, struct_cluster->S_cluster_router_id);
XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, router_id);
- SURFXML_BUFFER_SET(route_dst, router_id);
+ SURFXML_BUFFER_SET(route_src, struct_cluster->S_cluster_router_id);
+ SURFXML_BUFFER_SET(route_dst, struct_cluster->S_cluster_router_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
+ if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_END_TAG(route);
//from host to router
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, router_id);
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, struct_cluster->S_cluster_router_id);
XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, route_src_dst);
- SURFXML_BUFFER_SET(route_dst, router_id);
+ SURFXML_BUFFER_SET(route_dst, struct_cluster->S_cluster_router_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
+ if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_END_TAG(route);
//from router to host
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, route_src_dst);
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", struct_cluster->S_cluster_router_id, route_src_dst);
XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, router_id);
+ SURFXML_BUFFER_SET(route_src, struct_cluster->S_cluster_router_id);
SURFXML_BUFFER_SET(route_dst, route_src_dst);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
+ if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
+ if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
free(pcre_link_src);
free(route_src_dst);
- free(router_id);
+ xbt_free(availability_file);
+ xbt_free(state_file);
+
xbt_dict_free(&patterns);
- free(availability_file);
- free(state_file);
XBT_DEBUG("</AS>");
SURFXML_END_TAG(AS);
static void routing_parse_Speer(void)
{
static int AX_ptr = 0;
-
- char *peer_id = A_surfxml_peer_id;
- char *peer_power = A_surfxml_peer_power;
- char *peer_bw_in = A_surfxml_peer_bw_in;
- char *peer_bw_out = A_surfxml_peer_bw_out;
- char *peer_lat = A_surfxml_peer_lat;
- char *peer_coord = A_surfxml_peer_coordinates;
- char *peer_state_file = A_surfxml_peer_state_file;
- char *peer_availability_file = A_surfxml_peer_availability_file;
-
char *host_id = NULL;
char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
surfxml_bufferstack_push(1);
- SURFXML_BUFFER_SET(AS_id, peer_id);
+ SURFXML_BUFFER_SET(AS_id, struct_peer->V_peer_id);
SURFXML_BUFFER_SET(AS_routing, "Full");
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", struct_peer->V_peer_id);
SURFXML_START_TAG(AS);
XBT_DEBUG(" ");
- host_id = bprintf("peer_%s", peer_id);
- router_id = bprintf("router_%s", peer_id);
- link_id_up = bprintf("link_%s_up", peer_id);
- link_id_down = bprintf("link_%s_down", peer_id);
+ host_id = bprintf("peer_%s", struct_peer->V_peer_id);
+ router_id = bprintf("router_%s", struct_peer->V_peer_id);
+ link_id_up = bprintf("link_%s_up", struct_peer->V_peer_id);
+ link_id_down = bprintf("link_%s_down", struct_peer->V_peer_id);
- link_router = bprintf("%s_link_router", peer_id);
- link_backbone = bprintf("%s_backbone", peer_id);
+ link_router = bprintf("%s_link_router", struct_peer->V_peer_id);
+ link_backbone = bprintf("%s_backbone", struct_peer->V_peer_id);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, peer_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, struct_peer->V_peer_power);
A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, peer_power);
+ SURFXML_BUFFER_SET(host_power, struct_peer->V_peer_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
- SURFXML_BUFFER_SET(host_state_file, peer_state_file);
+ SURFXML_BUFFER_SET(host_availability_file, struct_peer->V_peer_availability_trace);
+ SURFXML_BUFFER_SET(host_state_file, struct_peer->V_peer_state_trace);
SURFXML_BUFFER_SET(host_coordinates, "");
+ SURFXML_BUFFER_SET(host_core, "1.0");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer_coord);
+ XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, struct_peer->V_peer_coord);
SURFXML_BUFFER_SET(router_id, router_id);
- SURFXML_BUFFER_SET(router_coordinates, peer_coord);
+ SURFXML_BUFFER_SET(router_coordinates, struct_peer->V_peer_coord);
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, peer_bw_in, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, struct_peer->V_peer_bw_in, struct_peer->V_peer_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_BUFFER_SET(link_id, link_id_up);
- SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in);
- SURFXML_BUFFER_SET(link_latency, peer_lat);
+ SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_in);
+ SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, peer_bw_out, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, struct_peer->V_peer_bw_out, struct_peer->V_peer_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_BUFFER_SET(link_id, link_id_down);
- SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out);
- SURFXML_BUFFER_SET(link_latency, peer_lat);
+ SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_out);
+ SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
break;
default:
XBT_INFO("Malformed radical");
+ break;
}
res = random_generate(random);
rd_name = bprintf("%s_router",random_id);
* New methods to init the routing model component from the lua script
*/
-/*
- * calling parse_S_AS_lua with lua values
- */
-void routing_AS_init(const char *AS_id, const char *AS_routing)
-{
- parse_S_AS_lua((char *) AS_id, (char *) AS_routing);
-}
-
-/*
- * calling parse_E_AS_lua to fisnish the creation of routing component
- */
-void routing_AS_end(const char *AS_id)
-{
- parse_E_AS_lua((char *) AS_id);
-}
/*
* add a host to the network element list
