#include "surf_routing.hpp"
#include "surf_routing_private.hpp"
+#include "surf_routing_cluster.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);
/* 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;
}
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()
{
