#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
static void routing_parse_Econfig(void); /* config Tag */
static char* replace_random_parameter(char * chaine);
-static void clean_dict_random(void);
+static void clean_routing_after_parse(void);
/* this lines are only for replace use like index in the model table */
typedef enum {
/**
* \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 *wanted_routing_type)
{
routing_component_t new_routing;
model_type_t model = NULL;
- 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))
+ if (!strcmp(wanted_routing_type, routing_models[cpt].name))
model = &routing_models[cpt];
/* if its not exist, error */
if (model == NULL) {
fprintf(stderr, "Routing model %s not found. Existing models:\n",
- wanted);
+ wanted_routing_type);
for (cpt = 0; routing_models[cpt].name; cpt++)
- if (!strcmp(wanted, routing_models[cpt].name))
fprintf(stderr, " %s: %s\n", routing_models[cpt].name,
routing_models[cpt].desc);
xbt_die(NULL);
/*
* 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) {
- THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id);
+ THROWF(arg_error, 0, "Close AS(%s), that were never opened", AS_id);
} else {
network_element_info_t info = NULL;
xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
/*
* \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 */
return latency;
}
+static int surf_parse_models_setup_already_called=0;
+/* Call the last initialization functions, that must be called after the
+ * <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
+ */
+void surf_parse_models_setup()
+{
+ if (surf_parse_models_setup_already_called)
+ return;
+ surf_parse_models_setup_already_called=1;
+ routing_parse_Erandom();
+ surf_config_models_setup();
+}
+
+
/**
* \brief Recursive function for finalize
*
xbt_dynar_free(&(global_routing->last_route));
/* delete global routing structure */
xbt_free(global_routing);
+ /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */
+ surf_parse_models_setup_already_called = 0;
}
static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc)
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);
&routing_parse_Speer);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
- &clean_dict_random);
+ &clean_routing_after_parse);
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
- surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup);
surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
}
-void surf_parse_models_setup()
-{
- routing_parse_Erandom();
- surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup);
- surf_config_models_setup(platform_filename);
- free(platform_filename);
-}
-
/* ************************************************** */
/* ********** PATERN FOR NEW ROUTING **************** */
if(xbt_cfg_is_default_value(_surf_cfg_set, key))
xbt_cfg_set_parse(_surf_cfg_set, cfg);
else
- XBT_INFO("The custom configuration '%s' is already define by user!",key);
+ XBT_INFO("The custom configuration '%s' is already defined by user!",key);
free(cfg);
}
XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
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_core = A_surfxml_cluster_core;
- char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
- char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
- char *cluster_power = xbt_strdup(A_surfxml_cluster_power);
- char *cluster_bw = xbt_strdup(A_surfxml_cluster_bw);
- char *cluster_lat = xbt_strdup(A_surfxml_cluster_lat);
char *host_id, *groups, *link_id = NULL;
- char *router_id = xbt_strdup(A_surfxml_cluster_router_id);
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);
-
- cluster_power = replace_random_parameter(cluster_power);
- cluster_bw = replace_random_parameter(cluster_bw);
- cluster_lat = replace_random_parameter(cluster_lat);
+ 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);
+ 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);
A_surfxml_host_state = A_surfxml_host_state_ON;
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, cluster_power);
+ 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, cluster_power);
+ 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);
SURFXML_BUFFER_SET(host_state_file, "");
}
- SURFXML_BUFFER_SET(host_core, cluster_core);
+ 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);
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,cluster_bw, cluster_lat);
+ 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, cluster_bw);
- SURFXML_BUFFER_SET(link_latency, 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, "");
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);
+ 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, cluster_power);
+ 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, cluster_power);
+ 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);
SURFXML_BUFFER_SET(host_state_file, "");
}
- SURFXML_BUFFER_SET(host_core, cluster_core);
+ 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);
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,cluster_bw, cluster_lat);
+ 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, cluster_bw);
- SURFXML_BUFFER_SET(link_latency, 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, "");
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);
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);
- xbt_free(cluster_bw);
- xbt_free(cluster_lat);
- xbt_free(cluster_power);
xbt_free(availability_file);
xbt_free(state_file);
- xbt_free(router_id);
xbt_dict_free(&patterns);
XBT_DEBUG("</AS>");
return string;
}
-static void clean_dict_random(void)
+static void clean_routing_after_parse(void)
{
xbt_dict_free(&random_value);
xbt_dict_free(&patterns);
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, "");
static void routing_parse_Erandom(void)
{
- xbt_dict_cursor_t cursor = NULL;
+ /*xbt_dict_cursor_t cursor = NULL;
char *key;
char *elem;
xbt_dict_foreach(random_value, cursor, key, elem) {
XBT_DEBUG("%s = %s",key,elem);
}
-
+*/
}
-
/*
* 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