#include "surf_routing.hpp"
#include "surf_routing_private.hpp"
+#include "surf_routing_cluster.hpp"
+#include "surf_routing_cluster_torus.hpp"
+
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "simgrid/sg_config.h"
/* global parse functions */
extern xbt_dynar_t mount_list;
-extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
-}
static void routing_parse_peer(sg_platf_peer_cbarg_t peer); /* peer bypass */
-static void routing_parse_Srandom(void); /* random bypass */
+// static void routing_parse_Srandom(void); /* random bypass */
static void routing_parse_postparse(void);
SURF_MODEL_DIJKSTRACACHE,
SURF_MODEL_NONE,
SURF_MODEL_VIVALDI,
- SURF_MODEL_CLUSTER
+ SURF_MODEL_CLUSTER,
+ SURF_MODEL_TORUS_CLUSTER,
+
} e_routing_types;
struct s_model_type routing_models[] = {
model_vivaldi_create, NULL},
{"Cluster", "Cluster routing",
model_cluster_create, NULL},
+ {"Torus_Cluster", "Torus Cluster routing",
+ model_torus_cluster_create, NULL},
{NULL, NULL, NULL, NULL}
};
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);
/* search the routing model */
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
- case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
- case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
- 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_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break;
+ case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
+ case A_surfxml_AS_routing_Cluster___torus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
+ case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
+ case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
+ 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_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break;
default: xbt_die("Not a valid model!!!");
break;
}
/* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
if (e_route_bypass) {
xbt_dynar_merge(links, &e_route_bypass->link_list);
- //FIXME:generic_free_route(e_route_bypass);
+ generic_free_route(e_route_bypass);
return;
}
{
char *host_id, *groups, *link_id = NULL;
xbt_dict_t patterns = NULL;
+ int rankId=0;
s_sg_platf_host_cbarg_t host;
s_sg_platf_link_cbarg_t link;
xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL);
}
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
+ /* parse the topology attribute. If we are not in a flat cluster,
+ * switch to the right mode and initialize the routing with
+ * the parameters in topo_parameters attribute
+ */
s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
AS.id = cluster->id;
- AS.routing = A_surfxml_AS_routing_Cluster;
- sg_platf_new_AS_begin(&AS);
+
+ if(cluster->topology == SURF_CLUSTER_TORUS){
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Torus_Cluster\">", cluster->id);
+ AS.routing = A_surfxml_AS_routing_Cluster___torus;
+ sg_platf_new_AS_begin(&AS);
+ ((AsClusterTorusPtr)current_routing)->parse_specific_arguments(cluster);
+ }else{
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
+ AS.routing = A_surfxml_AS_routing_Cluster;
+ sg_platf_new_AS_begin(&AS);
+ }
+
+ if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ ((AsClusterPtr)current_routing)->p_nb_links_per_node++;
+ ((AsClusterPtr)current_routing)->p_has_loopback=1;
+ }
+
+ if(cluster->limiter_link!=0){
+ ((AsClusterPtr)current_routing)->p_nb_links_per_node++;
+ ((AsClusterPtr)current_routing)->p_has_limiter=1;
+ }
+
+
current_routing->p_linkUpDownList
= xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,
cluster->bw, cluster->lat);
- memset(&link, 0, sizeof(link));
- link.id = link_id;
- link.bandwidth = cluster->bw;
- link.latency = cluster->lat;
- link.state = SURF_RESOURCE_ON;
- link.policy = cluster->sharing_policy;
- sg_platf_new_link(&link);
- s_surf_parsing_link_up_down_t info;
+ s_surf_parsing_link_up_down_t info_lim, info_loop;
+ // All links are saved in a matrix;
+ // every row describes a single node; every node
+ // may have multiple links.
+ // the first column may store a link from x to x if p_has_loopback is set
+ // the second column may store a limiter link if p_has_limiter is set
+ // other columns are to store one or more link for the node
- if (link.policy == SURF_LINK_FULLDUPLEX) {
- char *tmp_link = bprintf("%s_UP", link_id);
- info.link_up =
- xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
- free(tmp_link);
- tmp_link = bprintf("%s_DOWN", link_id);
- info.link_down =
+ //add a loopback link
+ 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_loop.link_up =
xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ info_loop.link_down = info_loop.link_up;
free(tmp_link);
- } else {
- info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
- info.link_down = info.link_up;
+ xbt_dynar_set(current_routing->p_linkUpDownList, rankId*((AsClusterPtr)current_routing)->p_nb_links_per_node, &info_loop);
}
+ //add a limiter link (shared link to account for maximal bandwidth of the node)
if(cluster->limiter_link!=0){
char *tmp_link = bprintf("%s_limiter", link_id);
XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link,
link.state = SURF_RESOURCE_ON;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
- info.limiter_link =
+ info_lim.link_up =
xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ info_lim.link_down = info_lim.link_up;
free(tmp_link);
- }else{
- info.limiter_link =NULL;
+ xbt_dynar_set(current_routing->p_linkUpDownList,
+ rankId*((AsClusterPtr)current_routing)->p_nb_links_per_node + ((AsClusterPtr)current_routing)->p_has_loopback ,
+ &info_lim);
+
}
- 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);
+ //call the cluster function that adds the others links
- 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;
- }
+ ((AsClusterPtr)current_routing)->create_links_for_node(cluster, i, rankId, rankId*
+ ((AsClusterPtr)current_routing)->p_nb_links_per_node
+ + ((AsClusterPtr)current_routing)->p_has_loopback
+ + ((AsClusterPtr)current_routing)->p_has_limiter );
- xbt_dynar_push(current_routing->p_linkUpDownList, &info);
xbt_free(link_id);
xbt_free(host_id);
+ rankId++;
}
xbt_dynar_free(&radical_ends);
free(link_down);
}
-static void routing_parse_Srandom(void)
-{
- double mean, std, min, max, seed;
- char *random_id = A_surfxml_random_id;
- char *random_radical = A_surfxml_random_radical;
- 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);
- 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);
-
- double res = 0;
- int i = 0;
- random_data_t random = xbt_new0(s_random_data_t, 1);
- char *tmpbuf;
-
- xbt_dynar_t radical_elements;
- unsigned int iter;
- char *groups;
- int start, end;
- xbt_dynar_t radical_ends;
-
- switch (A_surfxml_random_generator) {
- case AU_surfxml_random_generator:
- case A_surfxml_random_generator_NONE:
- random->generator = NONE;
- break;
- case A_surfxml_random_generator_DRAND48:
- random->generator = DRAND48;
- break;
- case A_surfxml_random_generator_RAND:
- random->generator = RAND;
- break;
- case A_surfxml_random_generator_RNGSTREAM:
- random->generator = RNGSTREAM;
- break;
- default:
- surf_parse_error("Invalid random generator");
- break;
- }
- random->seed = seed;
- random->min = min;
- random->max = max;
-
- /* Check user stupidities */
- if (max < min)
- THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
- if (mean < min)
- THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean, min);
- if (mean > max)
- THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, max);
-
- /* normalize the mean and standard deviation before storing */
- random->mean = (mean - min) / (max - min);
- random->std = std / (max - min);
-
- if (random->mean * (1 - random->mean) < random->std * random->std)
- THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
- random->mean, random->std);
-
- XBT_DEBUG
- ("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'",
- random_id, random->min, random->max, random->mean, random->std,
- (int)random->generator, random->seed, random_radical);
-
- if (!random_value)
- random_value = xbt_dict_new_homogeneous(free);
-
- if (!strcmp(random_radical, "")) {
- res = random_generate(random);
- rd_value = bprintf("%f", res);
- xbt_dict_set(random_value, random_id, rd_value, NULL);
- } else {
- radical_elements = xbt_str_split(random_radical, ",");
- xbt_dynar_foreach(radical_elements, iter, groups) {
- radical_ends = xbt_str_split(groups, "-");
- switch (xbt_dynar_length(radical_ends)) {
- case 1:
- xbt_assert(!xbt_dict_get_or_null(random_value, random_id),
- "Custom Random '%s' already exists !", random_id);
- res = random_generate(random);
- tmpbuf =
- bprintf("%s%d", random_id,
- atoi(xbt_dynar_getfirst_as(radical_ends, char *)));
- xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
- xbt_free(tmpbuf);
- break;
-
- case 2:
- start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
- for (i = start; i <= end; i++) {
- xbt_assert(!xbt_dict_get_or_null(random_value, random_id),
- "Custom Random '%s' already exists !", bprintf("%s%d",
- random_id,
- i));
- res = random_generate(random);
- tmpbuf = bprintf("%s%d", random_id, i);
- xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
- xbt_free(tmpbuf);
- }
- break;
- default:
- XBT_CRITICAL("Malformed radical");
- break;
- }
- res = random_generate(random);
- rd_name = bprintf("%s_router", random_id);
- rd_value = bprintf("%f", res);
- xbt_dict_set(random_value, rd_name, rd_value, NULL);
-
- xbt_dynar_free(&radical_ends);
- }
- free(rd_name);
- xbt_dynar_free(&radical_elements);
- }
-}
+// static void routing_parse_Srandom(void)
+// {
+// double mean, std, min, max, seed;
+// char *random_id = A_surfxml_random_id;
+// char *random_radical = A_surfxml_random_radical;
+// 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);
+// 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);
+
+// double res = 0;
+// int i = 0;
+// random_data_t random = xbt_new0(s_random_data_t, 1);
+// char *tmpbuf;
+
+// xbt_dynar_t radical_elements;
+// unsigned int iter;
+// char *groups;
+// int start, end;
+// xbt_dynar_t radical_ends;
+
+// switch (A_surfxml_random_generator) {
+// case AU_surfxml_random_generator:
+// case A_surfxml_random_generator_NONE:
+// random->generator = NONE;
+// break;
+// case A_surfxml_random_generator_DRAND48:
+// random->generator = DRAND48;
+// break;
+// case A_surfxml_random_generator_RAND:
+// random->generator = RAND;
+// break;
+// case A_surfxml_random_generator_RNGSTREAM:
+// random->generator = RNGSTREAM;
+// break;
+// default:
+// surf_parse_error("Invalid random generator");
+// break;
+// }
+// random->seed = seed;
+// random->min = min;
+// random->max = max;
+
+// /* Check user stupidities */
+// if (max < min)
+// THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+// if (mean < min)
+// THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean, min);
+// if (mean > max)
+// THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, max);
+
+// /* normalize the mean and standard deviation before storing */
+// random->mean = (mean - min) / (max - min);
+// random->std = std / (max - min);
+
+// if (random->mean * (1 - random->mean) < random->std * random->std)
+// THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+// random->mean, random->std);
+
+// XBT_DEBUG
+// ("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'",
+// random_id, random->min, random->max, random->mean, random->std,
+// (int)random->generator, random->seed, random_radical);
+
+// if (!random_value)
+// random_value = xbt_dict_new_homogeneous(free);
+
+// if (!strcmp(random_radical, "")) {
+// res = random_generate(random);
+// rd_value = bprintf("%f", res);
+// xbt_dict_set(random_value, random_id, rd_value, NULL);
+// } else {
+// radical_elements = xbt_str_split(random_radical, ",");
+// xbt_dynar_foreach(radical_elements, iter, groups) {
+// radical_ends = xbt_str_split(groups, "-");
+// switch (xbt_dynar_length(radical_ends)) {
+// case 1:
+// xbt_assert(!xbt_dict_get_or_null(random_value, random_id),
+// "Custom Random '%s' already exists !", random_id);
+// res = random_generate(random);
+// tmpbuf =
+// bprintf("%s%d", random_id,
+// atoi(xbt_dynar_getfirst_as(radical_ends, char *)));
+// xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
+// xbt_free(tmpbuf);
+// break;
+
+// case 2:
+// start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+// end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
+// for (i = start; i <= end; i++) {
+// xbt_assert(!xbt_dict_get_or_null(random_value, random_id),
+// "Custom Random '%s' already exists !", bprintf("%s%d",
+// random_id,
+// i));
+// res = random_generate(random);
+// tmpbuf = bprintf("%s%d", random_id, i);
+// xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
+// xbt_free(tmpbuf);
+// }
+// break;
+// default:
+// XBT_CRITICAL("Malformed radical");
+// break;
+// }
+// res = random_generate(random);
+// rd_name = bprintf("%s_router", random_id);
+// rd_value = bprintf("%f", res);
+// xbt_dict_set(random_value, rd_name, rd_value, NULL);
+
+// xbt_dynar_free(&radical_ends);
+// }
+// free(rd_name);
+// xbt_dynar_free(&radical_elements);
+// }
+// }
void routing_register_callbacks()
{
