/* 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 <pcre.h> /* regular expression library */
-
#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "surf_routing_private.h"
int ROUTING_ASR_LEVEL; //Routing level
int COORD_ASR_LEVEL; //Coordinates level
int NS3_ASR_LEVEL; //host node for ns3
+int ROUTING_PROP_ASR_LEVEL; //Where the properties are stored
static xbt_dict_t random_value = NULL;
xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
"Reading a host, processing unit \"%s\" already exists", host->id);
- info = xbt_new0(s_network_element_t, 1);
+ info = xbt_new0(s_routing_edge_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
info->name = xbt_strdup(host->id);
"Reading a router, processing unit \"%s\" already exists",
router->id);
- info = xbt_new0(s_network_element_t, 1);
+ info = xbt_new0(s_routing_edge_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
info->name = xbt_strdup(router->id);
}
}
+extern int _sg_init_status; /* yay, this is an horrible hack */
+
/**
* \brief Make a new routing component to the platform
*
* @param AS_id name of this autonomous system. Must be unique in the platform
* @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
*/
-void routing_AS_begin(const char *AS_id, int wanted_routing_type)
+void routing_AS_begin(sg_platf_AS_cbarg_t AS)
{
XBT_DEBUG("routing_AS_begin");
AS_t new_as;
routing_model_description_t model = NULL;
xbt_assert(!xbt_lib_get_or_null
- (as_router_lib, AS_id, ROUTING_ASR_LEVEL),
- "The AS \"%s\" already exists", AS_id);
+ (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 */
/* search the routing model */
- switch(wanted_routing_type){
+ 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;
new_as = (AS_t) model->create();
new_as->model_desc = model;
new_as->hierarchy = SURF_ROUTING_NULL;
- new_as->name = xbt_strdup(AS_id);
+ new_as->name = xbt_strdup(AS->id);
sg_routing_edge_t info = NULL;
- info = xbt_new0(s_network_element_t, 1);
+ info = xbt_new0(s_routing_edge_t, 1);
if (current_routing == NULL && routing_platf->root == NULL) {
} else if (current_routing != NULL && routing_platf->root != NULL) {
xbt_assert(!xbt_dict_get_or_null
- (current_routing->routing_sons, AS_id),
- "The AS \"%s\" already exists", AS_id);
+ (current_routing->routing_sons, AS->id),
+ "The AS \"%s\" already exists", AS->id);
/* it is a part of the tree */
new_as->routing_father = current_routing;
/* set the father behavior */
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
- xbt_dict_set(current_routing->routing_sons, AS_id,
+ xbt_dict_set(current_routing->routing_sons, AS->id,
(void *) new_as, NULL);
/* add to the father element list */
info->id = current_routing->parse_AS(current_routing, (void *) info);
info->rc_type = SURF_NETWORK_ELEMENT_AS;
info->name = new_as->name;
- xbt_lib_set(as_router_lib, new_as->name, ROUTING_ASR_LEVEL,
+ xbt_lib_set(as_router_lib, info->name, ROUTING_ASR_LEVEL,
(void *) info);
XBT_DEBUG("Having set name '%s' id '%d'",new_as->name,info->id);
* even if you add stuff to a closed AS
*
*/
-void routing_AS_end()
+void routing_AS_end(sg_platf_AS_cbarg_t AS)
{
if (current_routing == NULL) {
s_sg_platf_route_cbarg_t route;
memset(&route,0,sizeof(route));
- XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name, dst->name);
xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
+ XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name, dst->name);
/* Find how src and dst are interconnected */
AS_t common_father, src_father, dst_father;
}
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", cluster->id);
- sg_platf_new_AS_begin(cluster->id, A_surfxml_AS_routing_Cluster);
+ 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);
current_routing->link_up_down_list
= xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
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);