+/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#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"
+
#include "surf/surfxml_parse_values.h"
-#include "surf/random_mgr.h"
/**
* @ingroup SURF_build_api
int ROUTING_HOST_LEVEL; //Routing level
int SURF_CPU_LEVEL; //Surf cpu level
int SURF_WKS_LEVEL; //Surf workstation level
-int SIMIX_HOST_LEVEL; //Simix level
-int MSG_HOST_LEVEL; //Msg level
-int SD_HOST_LEVEL; //Simdag level
+int SIMIX_HOST_LEVEL; //Simix host level
+int SIMIX_STORAGE_LEVEL; //Simix storage level
+int MSG_HOST_LEVEL; //Msg host level
+int MSG_STORAGE_LEVEL; //Msg storage level
+int SD_HOST_LEVEL; //Simdag host level
+int SD_STORAGE_LEVEL; //Simdag storage level
int COORD_HOST_LEVEL=0; //Coordinates level
int NS3_HOST_LEVEL; //host node for ns3
-xbt_dict_t watched_hosts_lib;
-
/**
* @ingroup SURF_build_api
* @brief A library containing all known links
/* 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);
*/
static void parse_S_host_link(sg_platf_host_link_cbarg_t host)
{
- RoutingEdgePtr info = (RoutingEdgePtr) xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL);
+ RoutingEdgePtr info = static_cast<RoutingEdgePtr>(xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL));
xbt_assert(info, "Host '%s' not found!", host->id);
xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] ||
current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI],
current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
// If dynar is is greater than edge id and if the host_link is already defined
- if(xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id &&
+ if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id &&
xbt_dynar_get_as(current_routing->p_linkUpDownList, info->m_id, void*))
xbt_die("Host_link for '%s' is already defined!",host->id);
}
}
-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);
- _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+ _sg_cfg_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){
info->p_rcComponent = new_as->p_routingFather;
info->p_rcType = SURF_NETWORK_ELEMENT_AS;
- info->p_name = new_as->p_name;
+ info->p_name = xbt_strdup(new_as->p_name);
xbt_lib_set(as_router_lib, info->p_name, ROUTING_ASR_LEVEL,
(void *) info);
* even if you add stuff to a closed AS
*
*/
-void routing_AS_end(sg_platf_AS_cbarg_t AS)
+void routing_AS_end(sg_platf_AS_cbarg_t /*AS*/)
{
if (current_routing == NULL) {
{
xbt_assert(src && dst, "bad parameters for \"elements_father\" method");
#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */
- AS_t src_as, dst_as;
- AS_t path_src[ELEMENTS_FATHER_MAXDEPTH];
- AS_t path_dst[ELEMENTS_FATHER_MAXDEPTH];
+ AsPtr src_as, dst_as;
+ AsPtr path_src[ELEMENTS_FATHER_MAXDEPTH];
+ AsPtr path_dst[ELEMENTS_FATHER_MAXDEPTH];
int index_src = 0;
int index_dst = 0;
- AS_t current;
- AS_t current_src;
- AS_t current_dst;
- AS_t father;
+ AsPtr current;
+ AsPtr current_src;
+ AsPtr current_dst;
+ AsPtr father;
/* (1) find the as where the src and dst are located */
sg_routing_edge_t src_data = src;
/* Check whether a direct bypass is defined */
sg_platf_route_cbarg_t e_route_bypass = NULL;
//FIXME:REMOVE:if (common_father->get_bypass_route)
+
e_route_bypass = common_father->getBypassRoute(src, dst, latency);
/* 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;
}
"negative latency on route between \"%s\" and \"%s\"", src->p_name, dst->p_name);
}
-static xbt_dynar_t recursive_get_onelink_routes(AsPtr rc)
+xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
+ return recursiveGetOneLinkRoutes(p_root);
+}
+
+xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(AsPtr rc)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free);
xbt_dict_cursor_t cursor = NULL;
AS_t rc_child;
xbt_dict_foreach(rc->p_routingSons, cursor, key, rc_child) {
- xbt_dynar_t onelink_child = recursive_get_onelink_routes(rc_child);
+ xbt_dynar_t onelink_child = recursiveGetOneLinkRoutes(rc_child);
if (onelink_child)
xbt_dynar_merge(&ret,&onelink_child);
}
return ret;
}
-static xbt_dynar_t get_onelink_routes(void)
-{
- return recursive_get_onelink_routes(routing_platf->p_root);
-}
-
e_surf_network_element_type_t routing_get_network_element_type(const char *name)
{
RoutingEdgePtr rc = sg_routing_edge_by_name_or_null(name);
/* config the uniq global routing */
routing_platf = new RoutingPlatf();
routing_platf->p_root = NULL;
- //FIXME:routing_platf->get_onelink_routes = get_onelink_routes;
- //FIXME:routing_platf->loopback = loopback;
+ routing_platf->p_loopback = loopback;
routing_platf->p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
/* no current routing at moment */
current_routing = NULL;
void routing_cluster_add_backbone(void* bb) {
xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER],
"You have to be in model Cluster to use tag backbone!");
- /*FIXME:xbt_assert(!((as_cluster_t)current_routing)->p_backbone, "The backbone link is already defined!");
- ((as_cluster_t)current_routing)->p_backbone = bb;*/
- XBT_DEBUG("Add a backbone to AS '%s'",current_routing->p_name);
+ xbt_assert(!surf_as_cluster_get_backbone(current_routing), "The backbone link is already defined!");
+ surf_as_cluster_set_backbone(current_routing, bb);
+ XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name);
}
static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet)
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.initial_state = SURF_RESOURCE_ON;
- host.power_peak = cabinet->power;
+ host.pstate = 0;
host.power_scale = 1.0;
host.core_amount = 1;
link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix);
host.id = host_id;
link.id = link_id;
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&cabinet->power);
+ host.power_peak = power_state_list;
sg_platf_new_host(&host);
sg_platf_new_link(&link);
XBT_DEBUG("\tstate_file=\"\"");
}
- host.power_peak = cluster->power;
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&cluster->power);
+ host.power_peak = power_state_list;
+ host.pstate = 0;
+
+ //host.power_peak = cluster->power;
host.power_scale = 1.0;
host.core_amount = cluster->core_amount;
host.initial_state = SURF_RESOURCE_ON;
static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
{
char *host_id = NULL;
- char *link_id;
+ char *link_id = NULL;
+ char *router_id = NULL;
XBT_DEBUG(" ");
host_id = HOST_PEER(peer->id);
link_id = LINK_PEER(peer->id);
+ router_id = ROUTER_PEER(peer->id);
+
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", peer->id);
+ s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER;
+ AS.id = peer->id;
+ AS.routing = A_surfxml_AS_routing_Cluster;
+ sg_platf_new_AS_begin(&AS);
+
+ current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->power);
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.initial_state = SURF_RESOURCE_ON;
host.id = host_id;
- host.power_peak = peer->power;
+
+ xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push(power_state_list,&peer->power);
+ host.power_peak = power_state_list;
+ host.pstate = 0;
+ //host.power_peak = peer->power;
host.power_scale = 1.0;
host.power_trace = peer->availability_trace;
host.state_trace = peer->state_trace;
host.core_amount = 1;
- host.coord = peer->coord;
sg_platf_new_host(&host);
s_sg_platf_link_cbarg_t link;
host_link.link_down= link_down;
sg_platf_new_host_link(&host_link);
+ XBT_DEBUG("<router id=\"%s\"/>", router_id);
+ s_sg_platf_router_cbarg_t router;
+ memset(&router, 0, sizeof(router));
+ router.id = router_id;
+ router.coord = peer->coord;
+ sg_platf_new_router(&router);
+ static_cast<AsClusterPtr>(current_routing)->p_router = static_cast<RoutingEdgePtr>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
+
+ XBT_DEBUG("</AS>");
+ sg_platf_new_AS_end();
XBT_DEBUG(" ");
//xbt_dynar_free(&tab_elements_num);
+ free(router_id);
free(host_id);
free(link_id);
free(link_up);
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()
{
/** \brief Frees all memory allocated by the routing module */
void routing_exit(void) {
- if (!routing_platf)
- return;
- xbt_dynar_free(&routing_platf->p_lastRoute);
- finalize_rec(routing_platf->p_root);
- xbt_free(routing_platf);
+ delete routing_platf;
+}
+
+RoutingPlatf::~RoutingPlatf()
+{
+ xbt_dynar_free(&p_lastRoute);
+ finalize_rec(p_root);
}
AS_t surf_AS_get_routing_root() {