#include "surf/surf_routing.h"
#include "surf/surfxml_parse_values.h"
-#include <pcre.h> /* regular expression library */
-
/**
* @ingroup SURF_build_api
* @brief A library containing all known workstations
}
}
-extern int _surf_init_status; /* yay, this is an horrible hack */
+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);
- _surf_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+ _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(AS->routing){
bprintf("%s%s_router%s", cluster->prefix, cluster->id,
cluster->suffix);
sg_platf_new_router(&router);
+ ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL);
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);