#include "surf/surf_routing.h"
#include "surf/surfxml_parse_values.h"
-#include <pcre.h> /* regular expression library */
-
/**
* @ingroup SURF_build_api
* @brief A library containing all known workstations
SURF_MODEL_DIJKSTRA,
SURF_MODEL_DIJKSTRACACHE,
SURF_MODEL_NONE,
- SURF_MODEL_RULEBASED,
SURF_MODEL_VIVALDI,
SURF_MODEL_CLUSTER
} e_routing_types;
model_dijkstracache_create, model_dijkstra_both_end},
{"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
model_none_create, NULL},
- {"RuleBased", "Rule-Based routing data (...)",
- model_rulebased_create, NULL},
{"Vivaldi", "Vivaldi routing",
model_vivaldi_create, NULL},
{"Cluster", "Cluster routing",
s_surf_parsing_link_up_down_t link_up_down;
link_up_down.link_up = xbt_lib_get_or_null(link_lib, host->link_up, SURF_LINK_LEVEL);
link_up_down.link_down = xbt_lib_get_or_null(link_lib, host->link_down, SURF_LINK_LEVEL);
+ link_up_down.limiter_link = NULL;
+ link_up_down.loopback_link = NULL;
xbt_assert(link_up_down.link_up, "Link '%s' not found!",host->link_up);
xbt_assert(link_up_down.link_down, "Link '%s' not found!",host->link_down);
}
}
-extern int _surf_init_status; /* yay, this is an horrible hack */
+extern int _sg_init_status; /* yay, this is an horrible hack */
/**
* \brief Make a new routing component to the platform
(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
"The AS \"%s\" already exists", AS->id);
- _surf_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+ _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
/* search the routing model */
switch(AS->routing){
case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break;
case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break;
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;
info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
info.link_down = info.link_up;
}
+
+ if(cluster->limiter_link!=0){
+ char *tmp_link = bprintf("%s_limiter", link_id);
+ XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link,
+ cluster->limiter_link);
+
+
+ memset(&link, 0, sizeof(link));
+ link.id = tmp_link;
+ link.bandwidth = cluster->limiter_link;
+ link.latency = 0;
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_SHARED;
+ sg_platf_new_link(&link);
+ info.limiter_link =
+ xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }else{
+ info.limiter_link =NULL;
+ }
+
+ if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ char *tmp_link = bprintf("%s_loopback", link_id);
+ XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link,
+ cluster->limiter_link);
+
+
+ memset(&link, 0, sizeof(link));
+ link.id = tmp_link;
+ link.bandwidth = cluster->loopback_bw;
+ link.latency = cluster->loopback_lat;
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_FATPIPE;
+ sg_platf_new_link(&link);
+ info.loopback_link =
+ xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }else{
+ info.loopback_link =NULL;
+ }
+
xbt_dynar_push(current_routing->link_up_down_list,&info);
xbt_free(link_id);
xbt_free(host_id);
bprintf("%s%s_router%s", cluster->prefix, cluster->id,
cluster->suffix);
sg_platf_new_router(&router);
+ ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
free(newid);
//Make the backbone
- if ((cluster->bb_bw != 0) && (cluster->bb_lat != 0)) {
+ if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) {
char *link_backbone = bprintf("%s_backbone", cluster->id);
XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link_backbone,
cluster->bb_bw, cluster->bb_lat);
char *rd_name = NULL;
char *rd_value;
mean = surf_parse_get_double(A_surfxml_random_mean);
- std = surf_parse_get_double(A_surfxml_random_std_deviation);
+ std = surf_parse_get_double(A_surfxml_random_std___deviation);
min = surf_parse_get_double(A_surfxml_random_min);
max = surf_parse_get_double(A_surfxml_random_max);
seed = surf_parse_get_double(A_surfxml_random_seed);