From 2b57a1bbba3a2a7ad5faa425475a3f1b75f54b3b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 29 Feb 2016 10:33:45 +0100 Subject: [PATCH 1/1] Small cleanups in routing - Kill commented code - Kill a now unused field - Various reindent and tidying --- src/surf/surf_routing.cpp | 138 +------------------------------------- src/surf/surf_routing.hpp | 3 +- 2 files changed, 4 insertions(+), 137 deletions(-) diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 1ef547b3c5..10e404db81 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -342,8 +342,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing->hierarchy_ == SURF_ROUTING_NULL) current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ - xbt_dict_set(current_routing->sons_, AS->id, - (void *) new_as, NULL); + xbt_dict_set(current_routing->sons_, AS->id, (void *) new_as, NULL); /* add to the father element list */ netcard->setId(current_routing->addComponent(netcard)); } else { @@ -366,11 +365,6 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) * * Once you've declared all the content of your AS, you have to close * it with this call. Your AS is not usable until you call this function. - * - * @fixme: this call is not as robust as wanted: bad things WILL happen - * if you call it twice for the same AS, or if you forget calling it, or - * even if you add stuff to a closed AS - * */ void routing_AS_end() { @@ -379,8 +373,6 @@ void routing_AS_end() current_routing = current_routing->father_; } -/* Aux Business methods */ - /** * \brief Get the AS father and the first elements of the chain * @@ -391,9 +383,7 @@ void routing_AS_end() * father in the chain */ static void elements_father(sg_netcard_t src, sg_netcard_t dst, - AS_t * res_father, - AS_t * res_src, - AS_t * res_dst) + AS_t * res_father, AS_t * res_src, AS_t * res_dst) { xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); #define ROUTING_HIERARCHY_MAXDEPTH 16 /* increase if it is not enough */ @@ -727,126 +717,6 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) 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 check_disk_attachment() { xbt_lib_cursor_t cursor; @@ -904,7 +774,6 @@ namespace surf { } RoutingPlatf::~RoutingPlatf() { - xbt_dynar_free(&lastRoute_); finalize_rec(root_); } @@ -919,8 +788,7 @@ const char *surf_AS_get_name(simgrid::surf::As *as) { return as->name_; } -static simgrid::surf::As *surf_AS_recursive_get_by_name( - simgrid::surf::As *current, const char * name) +static simgrid::surf::As *surf_AS_recursive_get_by_name(simgrid::surf::As *current, const char * name) { xbt_dict_cursor_t cursor = NULL; char *key; diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 07afc8d76e..c64d677cb2 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -140,7 +140,7 @@ private: }; /** @ingroup SURF_routing_interface - * @brief Link of lenght 1, alongside with its source and destination. This is mainly usefull in the ns3 bindings + * @brief Link of length 1, alongside with its source and destination. This is mainly useful in the ns3 bindings */ class Onelink { public: @@ -160,7 +160,6 @@ public: ~RoutingPlatf(); As *root_ = nullptr; Link *loopback_; - xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL); xbt_dynar_t getOneLinkRoutes(void); void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * links, double *latency); }; -- 2.20.1