-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009, 2010, 2011. 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 <pcre.h> /* regular expression library */
+
+#include "simgrid/platf_interface.h" // platform creation API internal interface
+
#include "surf_routing_private.h"
#include "surf/surf_routing.h"
#include "surf/surfxml_parse_values.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
-static void routing_parse_Speer(void); /* peer bypass */
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer); /* peer bypass */
static void routing_parse_Srandom(void); /* random bypass */
-static void routing_parse_Erandom(void); /* random bypass */
-
-static void routing_parse_Sconfig(void); /* config Tag */
-static void routing_parse_Econfig(void); /* config Tag */
static char* replace_random_parameter(char * chaine);
-static void clean_dict_random(void);
+static void clean_routing_after_parse(void);
/* this lines are only for replace use like index in the model table */
typedef enum {
SURF_MODEL_DIJKSTRA,
SURF_MODEL_DIJKSTRACACHE,
SURF_MODEL_NONE,
- SURF_MODEL_RULEBASED
+ SURF_MODEL_RULEBASED,
+ SURF_MODEL_VIVALDI,
+ SURF_MODEL_CLUSTER
} e_routing_types;
-struct s_model_type routing_models[] = { {"Full",
- "Full routing data (fast, large memory requirements, fully expressive)",
- model_full_create,
- model_full_load,
- model_full_unload,
- model_full_end},
-{"Floyd",
- "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
- model_floyd_create, model_floyd_load, model_floyd_unload,
- model_floyd_end},
-{"Dijkstra",
- "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
- model_dijkstra_create, model_dijkstra_both_load,
- model_dijkstra_both_unload, model_dijkstra_both_end},
-{"DijkstraCache",
- "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
- model_dijkstracache_create, model_dijkstra_both_load,
- model_dijkstra_both_unload, model_dijkstra_both_end},
-{"none", "No routing (usable with Constant network only)",
- model_none_create, model_none_load, model_none_unload, model_none_end},
-{"RuleBased", "Rule-Based routing data (...)", model_rulebased_create,
- model_rulebased_load, model_rulebased_unload, model_rulebased_end},
-{"Vivaldi", "Vivaldi routing", model_rulebased_create,
- model_rulebased_load, model_rulebased_unload, model_rulebased_end},
-{NULL, NULL, NULL, NULL, NULL, NULL}
+struct s_model_type routing_models[] = {
+ { "Full", "Full routing data (fast, large memory requirements, fully expressive)",
+ model_full_create, model_full_load, model_full_unload, model_full_end
+ },
+ { "Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
+ model_floyd_create, model_floyd_load, model_floyd_unload, model_floyd_end
+ },
+ { "Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
+ model_dijkstra_create, model_dijkstra_both_load,
+ model_dijkstra_both_unload, model_dijkstra_both_end
+ },
+ { "DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
+ model_dijkstracache_create, model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end
+ },
+ { "none", "No routing (usable with Constant network only)",
+ model_none_create, model_none_load, model_none_unload, model_none_end
+ },
+ { "RuleBased", "Rule-Based routing data (...)",
+ model_rulebased_create, model_none_load, model_none_unload, model_none_end
+ },
+ { "Vivaldi", "Vivaldi routing",
+ model_vivaldi_create, model_none_load, model_none_unload, model_none_end
+ },
+ {"Cluster", "Cluster routing",
+ model_cluster_create, model_none_load, model_cluster_unload, model_none_end
+ },
+ {NULL, NULL, NULL, NULL, NULL, NULL}
};
-static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
-{
- double src_coord, dst_coord;
-
- src_coord = atof(xbt_dynar_get_as(src, index, char *));
- dst_coord = atof(xbt_dynar_get_as(dst, index, char *));
-
- return (src_coord-dst_coord)*(src_coord-dst_coord);
-
-}
-
-static double base_vivaldi_get_latency (const char *src, const char *dst)
-{
- double euclidean_dist;
- xbt_dynar_t src_ctn, dst_ctn;
- src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL);
- if(!src_ctn) src_ctn = xbt_lib_get_or_null(as_router_lib, src, COORD_ASR_LEVEL);
- dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL);
- if(!dst_ctn) dst_ctn = xbt_lib_get_or_null(as_router_lib, dst, COORD_ASR_LEVEL);
-
- if(dst_ctn == NULL || src_ctn == NULL)
- xbt_die("Coord src '%s' :%p dst '%s' :%p",src,src_ctn,dst,dst_ctn);
-
- euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
- + fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *)));
-
- xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
-
- //From .ms to .s
- return euclidean_dist / 1000;
-}
-
-static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route)
-{
- if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
- int need_to_clean = e_route?0:1;
- double latency;
- e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst);
- latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway);
- if(need_to_clean) generic_free_extended_route(e_route);
- return latency;
- } else {
- return base_vivaldi_get_latency(src,dst);
- }
-}
-
/**
* \brief Add a "host" to the network element list
*/
-static void parse_S_host(const char *host_id, const char* coord)
-{
+static void parse_S_host(sg_platf_host_cbarg_t host) {
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL),
- "Reading a host, processing unit \"%s\" already exists",
- host_id);
+ xbt_assert(!xbt_lib_get_or_null(host_lib, host->id,ROUTING_HOST_LEVEL),
+ "Reading a host, processing unit \"%s\" already exists",
+ host->id);
xbt_assert(current_routing->set_processing_unit,
- "no defined method \"set_processing_unit\" in \"%s\"",
- current_routing->name);
- (*(current_routing->set_processing_unit)) (current_routing, host_id);
+ "no defined method \"set_processing_unit\" in \"%s\"",
+ current_routing->name);
+ (*(current_routing->set_processing_unit)) (current_routing, host->id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
- xbt_lib_set(host_lib,host_id,ROUTING_HOST_LEVEL,(void *) info);
- if (strcmp(coord,"")) {
- if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
- xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
+ xbt_lib_set(host_lib,host->id,ROUTING_HOST_LEVEL,(void *) info);
+ if (host->coord && strcmp(host->coord,"")) {
+ if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
+ xbt_dynar_t ctn = xbt_str_split_str(host->coord, " ");
xbt_dynar_shrink(ctn, 0);
- xbt_lib_set(host_lib,host_id,COORD_HOST_LEVEL,(void *) ctn);
+ xbt_lib_set(host_lib,host->id,COORD_HOST_LEVEL,(void *) ctn);
}
}
-static void parse_E_host(void)
-{
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- char *elem;
-
- xbt_dict_foreach(current_property_set, cursor, key, elem) {
- XBT_DEBUG("property : %s = %s",key,elem);
- }
-}
-
-/*
- * \brief Add a host to the network element list from XML
- */
-static void parse_S_host_XML(void)
-{
- parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates);
-}
-static void parse_E_host_XML(void)
-{
- parse_E_host();
-}
-
-/*
- * \brief Add a host to the network element list from lua script
- */
-static void parse_S_host_lua(const char *host_id, const char *coord)
-{
- parse_S_host(host_id, coord);
-}
-
-
/**
* \brief Add a "router" to the network element list
*/
-static void parse_S_router(void)
+static void parse_S_router(sg_platf_router_cbarg_t router)
{
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert(!xbt_lib_get_or_null(as_router_lib,struct_router->V_router_id, ROUTING_ASR_LEVEL),
- "Reading a router, processing unit \"%s\" already exists",
- struct_router->V_router_id);
+ xbt_assert(!xbt_lib_get_or_null(as_router_lib,router->id, ROUTING_ASR_LEVEL),
+ "Reading a router, processing unit \"%s\" already exists",
+ router->id);
xbt_assert(current_routing->set_processing_unit,
- "no defined method \"set_processing_unit\" in \"%s\"",
- current_routing->name);
- (*(current_routing->set_processing_unit)) (current_routing,
- struct_router->V_router_id);
+ "no defined method \"set_processing_unit\" in \"%s\"",
+ current_routing->name);
+ (*(current_routing->set_processing_unit)) (current_routing, router->id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
- xbt_lib_set(as_router_lib,struct_router->V_router_id,ROUTING_ASR_LEVEL,(void *) info);
- if (strcmp(A_surfxml_router_coordinates,"")) {
- if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
- xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
+ xbt_lib_set(as_router_lib,router->id,ROUTING_ASR_LEVEL,(void *) info);
+ if (strcmp(router->coord,"")) {
+ if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
+ xbt_dynar_t ctn = xbt_str_split_str(router->coord, " ");
xbt_dynar_shrink(ctn, 0);
- xbt_lib_set(as_router_lib,struct_router->V_router_id,COORD_ASR_LEVEL,(void *) ctn);
+ xbt_lib_set(as_router_lib,router->id,COORD_ASR_LEVEL,(void *) ctn);
}
}
-/**
- * brief Add a "router" to the network element list from XML description
- */
-static void parse_S_router_XML(void)
-{
- return parse_S_router();
-}
-
-/**
- * brief Add a "router" to the network element list from XML description
- */
-static void parse_S_router_lua(const char* router_id)
-{
- struct_router->V_router_id = xbt_strdup(router_id);
- struct_router->V_router_coord = xbt_strdup("");
- return parse_S_router();
-}
-
/**
* \brief Set the endponints for a route
*/
{
if (src != NULL && dst != NULL && link_list != NULL)
THROWF(arg_error, 0, "Route between %s to %s can not be defined",
- src_id, dst_id);
+ src_id, dst_id);
src = src_id;
dst = dst_id;
xbt_assert(strlen(src) > 0 || strlen(dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ "Some limits are null in the route between \"%s\" and \"%s\"",
+ src, dst);
link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
static void parse_S_route_new_and_endpoints_XML(void)
{
parse_S_route_new_and_endpoints(A_surfxml_route_src,
- A_surfxml_route_dst);
-}
-
-/**
- * \brief Set the endpoints for a route from lua
- */
-static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
-{
- parse_S_route_new_and_endpoints(id_src, id_dst);
+ A_surfxml_route_dst);
}
/**
{
if (src != NULL && dst != NULL && link_list != NULL)
THROWF(arg_error, 0, "Route between %s to %s can not be defined",
- A_surfxml_ASroute_src, A_surfxml_ASroute_dst);
+ A_surfxml_ASroute_src, A_surfxml_ASroute_dst);
src = A_surfxml_ASroute_src;
dst = A_surfxml_ASroute_dst;
gw_src = A_surfxml_ASroute_gw_src;
gw_dst = A_surfxml_ASroute_gw_dst;
xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
- || strlen(gw_dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ || strlen(gw_dst) > 0,
+ "Some limits are null in the route between \"%s\" and \"%s\"",
+ src, dst);
link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
{
if (src != NULL && dst != NULL && link_list != NULL)
THROWF(arg_error, 0,
- "Bypass Route between %s to %s can not be defined",
- A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
+ "Bypass Route between %s to %s can not be defined",
+ A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
src = A_surfxml_bypassRoute_src;
dst = A_surfxml_bypassRoute_dst;
gw_src = A_surfxml_bypassRoute_gw_src;
gw_dst = A_surfxml_bypassRoute_gw_dst;
xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
- || strlen(gw_dst) > 0,
- "Some limits are null in the route between \"%s\" and \"%s\"",
- src, dst);
+ || strlen(gw_dst) > 0,
+ "Some limits are null in the route between \"%s\" and \"%s\"",
+ src, dst);
link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
}
}
-/**
- * \brief Set a new link on the actual list of link for a route or ASroute from lua
- */
-static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
-{
- parse_E_link_ctn_new_elem(link_id);
-}
-
/**
* \brief Store the route by calling the set_route function of the current routing component
*/
name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
route->generic_route.link_list = link_list;
xbt_assert(current_routing->set_route,
- "no defined method \"set_route\" in \"%s\"",
- current_routing->name);
+ "no defined method \"set_route\" in \"%s\"",
+ current_routing->name);
(*(current_routing->set_route)) (current_routing, src, dst, route);
link_list = NULL;
src = NULL;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->set_ASroute,
- "no defined method \"set_ASroute\" in \"%s\"",
- current_routing->name);
+ "no defined method \"set_ASroute\" in \"%s\"",
+ current_routing->name);
(*(current_routing->set_ASroute)) (current_routing, src, dst, e_route);
link_list = NULL;
src = NULL;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->set_bypassroute,
- "no defined method \"set_bypassroute\" in \"%s\"",
- current_routing->name);
+ "no defined method \"set_bypassroute\" in \"%s\"",
+ current_routing->name);
(*(current_routing->set_bypassroute)) (current_routing, src, dst,
- e_route);
+ e_route);
link_list = NULL;
src = NULL;
dst = NULL;
}
/**
- * \brief Make a new routing component
+ * \brief Make a new routing component to the platform
+ *
+ * Add a new autonomous system to the platform. Any elements (such as host,
+ * router or sub-AS) added after this call and before the corresponding call
+ * to sg_platf_new_AS_close() will be added to this AS.
*
- * make the new structure and
- * set the parsing functions to allows parsing the part of the routing tree
+ * Once this function was called, the configuration concerning the used
+ * models cannot be changed anymore.
+ *
+ * @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_init(const char *AS_id, const char *wanted_routing_type)
+void routing_AS_open(const char *AS_id, const char *wanted_routing_type)
{
routing_component_t new_routing;
model_type_t model = NULL;
int cpt;
+
+ surf_parse_models_setup(); /* ensure that the models are created after the last <config> tag and before the first <AS>-like */
+
/* search the routing model */
for (cpt = 0; routing_models[cpt].name; cpt++)
if (!strcmp(wanted_routing_type, routing_models[cpt].name))
/* if its not exist, error */
if (model == NULL) {
fprintf(stderr, "Routing model %s not found. Existing models:\n",
- wanted_routing_type);
+ wanted_routing_type);
for (cpt = 0; routing_models[cpt].name; cpt++)
- fprintf(stderr, " %s: %s\n", routing_models[cpt].name,
- routing_models[cpt].desc);
+ fprintf(stderr, " %s: %s\n", routing_models[cpt].name,
+ routing_models[cpt].desc);
xbt_die(NULL);
}
new_routing->name = xbt_strdup(AS_id);
new_routing->routing_sons = xbt_dict_new();
- /* Hack for Vivaldi */
- if(!strcmp(model->name,"Vivaldi"))
- new_routing->get_latency = vivaldi_get_link_latency;
-
if (current_routing == NULL && global_routing->root == NULL) {
/* it is the first one */
} else if (current_routing != NULL && global_routing->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_routing->routing_father = current_routing;
/* set the father behavior */
current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
xbt_dict_set(current_routing->routing_sons, AS_id,
- (void *) new_routing, NULL);
+ (void *) new_routing, NULL);
/* add to the father element list */
(*(current_routing->set_autonomous_system)) (current_routing, AS_id);
/* unload the prev parse rules */
current_routing = new_routing;
}
-/*
- * Detect the routing model type of the routing component from XML platforms
- */
-static void parse_S_AS(void)
-{
- routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
-}
-
-
/**
- * \brief Finish the creation of a new routing component
+ * \brief Specify that the current description of AS is finished
+ *
+ * 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
*
- * When you finish to read the routing component, other structures must be created.
- * the "end" method allow to do that for any routing model type
*/
-void routing_AS_end(const char *AS_id)
-{
+void routing_AS_close() {
if (current_routing == NULL) {
- THROWF(arg_error, 0, "Close AS(%s), that were never opened", AS_id);
+ THROWF(arg_error, 0, "Close an AS, but none was under construction");
} else {
network_element_info_t info = NULL;
xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
- "The AS \"%s\" already exists",current_routing->name);
+ "The AS \"%s\" already exists",current_routing->name);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing->routing_father;
info->rc_type = SURF_NETWORK_ELEMENT_AS;
}
}
-/*
- * \brief Finish the creation of a new routing component from XML
- */
-static void parse_E_AS(void)
-{
- routing_AS_end(A_surfxml_AS_id);
-}
-
/* Aux Business methods */
/**
*
*/
static char* elements_As_name(const char *name)
-{
+ {
routing_component_t as_comp;
/* (1) find the as where the host is located */
as_comp = ((network_element_info_t)
- xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component;
+ xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component;
return as_comp->name;
-}
+ }
/**
* father in the chain
*/
static void elements_father(const char *src, const char *dst,
- routing_component_t *res_father,
- routing_component_t *res_src,
- routing_component_t *res_dst)
+ routing_component_t *res_father,
+ routing_component_t *res_src,
+ routing_component_t *res_dst)
{
xbt_assert(src && dst, "bad parameters for \"elements_father\" method");
#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */
/* (1) find the as where the src and dst are located */
network_element_info_t src_data = xbt_lib_get_or_null(host_lib, src,
- ROUTING_HOST_LEVEL);
+ ROUTING_HOST_LEVEL);
network_element_info_t dst_data = xbt_lib_get_or_null(host_lib, dst,
- ROUTING_HOST_LEVEL);
+ ROUTING_HOST_LEVEL);
if (!src_data)
src_data = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
if (!dst_data)
dst_as = dst_data->rc_component;
xbt_assert(src_as && dst_as,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst);
+ "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst);
/* (2) find the path to the root routing component */
for (current = src_as ; current != NULL ; current = current->routing_father) {
* recursively through the routing components tree.
*/
static void _get_route_latency(const char *src, const char *dst,
- xbt_dynar_t *route, double *latency)
+ xbt_dynar_t *route, double *latency)
{
XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst);
xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
if (latency) {
*latency = common_father->get_latency(common_father, src, dst, e_route);
xbt_assert(*latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"", src, dst);
+ "latency error on route between \"%s\" and \"%s\"", src, dst);
}
if (e_route) {
xbt_free(e_route->src_gateway);
e_route_bypass = common_father->get_bypass_route(common_father, src, dst);
xbt_assert(!latency || !e_route_bypass,
- "Bypass cannot work yet with get_latency");
+ "Bypass cannot work yet with get_latency");
route_extended_t e_route_cnt = e_route_bypass
- ? e_route_bypass
- : common_father->get_route(common_father,
- src_father->name, dst_father->name);
+ ? e_route_bypass
+ : common_father->get_route(common_father,
+ src_father->name, dst_father->name);
xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
- src_father->name, dst_father->name);
+ src_father->name, dst_father->name);
xbt_assert((e_route_cnt->src_gateway == NULL) ==
- (e_route_cnt->dst_gateway == NULL),
- "bad gateway for route between \"%s\" and \"%s\"", src, dst);
+ (e_route_cnt->dst_gateway == NULL),
+ "bad gateway for route between \"%s\" and \"%s\"", src, dst);
if (route) {
*route = xbt_dynar_new(global_routing->size_of_link, NULL);
}
if (latency) {
*latency = common_father->get_latency(common_father,
- src_father->name, dst_father->name,
- e_route_cnt);
+ src_father->name, dst_father->name,
+ e_route_cnt);
xbt_assert(*latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- src_father->name, dst_father->name);
+ "latency error on route between \"%s\" and \"%s\"",
+ src_father->name, dst_father->name);
}
void *link;
xbt_dynar_t route_src;
_get_route_latency(src, e_route_cnt->src_gateway,
- (route ? &route_src : NULL),
- (latency ? &latency_src : NULL));
+ (route ? &route_src : NULL),
+ (latency ? &latency_src : NULL));
if (route) {
xbt_assert(route_src, "no route between \"%s\" and \"%s\"",
- src, e_route_cnt->src_gateway);
+ src, e_route_cnt->src_gateway);
xbt_dynar_foreach(route_src, cpt, link) {
xbt_dynar_push(*route, &link);
}
}
if (latency) {
xbt_assert(latency_src >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- src, e_route_cnt->src_gateway);
+ "latency error on route between \"%s\" and \"%s\"",
+ src, e_route_cnt->src_gateway);
*latency += latency_src;
}
}
xbt_dynar_t route_dst;
_get_route_latency(e_route_cnt->dst_gateway, dst,
- (route ? &route_dst : NULL),
- (latency ? &latency_dst : NULL));
+ (route ? &route_dst : NULL),
+ (latency ? &latency_dst : NULL));
if (route) {
xbt_assert(route_dst, "no route between \"%s\" and \"%s\"",
- e_route_cnt->dst_gateway, dst);
+ e_route_cnt->dst_gateway, dst);
xbt_dynar_foreach(route_dst, cpt, link) {
xbt_dynar_push(*route, &link);
}
}
if (latency) {
xbt_assert(latency_dst >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- e_route_cnt->dst_gateway, dst);
+ "latency error on route between \"%s\" and \"%s\"",
+ e_route_cnt->dst_gateway, dst);
*latency += latency_dst;
}
}
* \brief Generic function for get_route, get_route_no_cleanup, and get_latency
*/
static void get_route_latency(const char *src, const char *dst,
- xbt_dynar_t *route, double *latency, int cleanup)
+ xbt_dynar_t *route, double *latency, int cleanup)
{
_get_route_latency(src, dst, route, latency);
xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
xbt_assert(!latency || *latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"", src, dst);
+ "latency error on route between \"%s\" and \"%s\"", src, dst);
if (route) {
xbt_dynar_free(&global_routing->last_route);
global_routing->last_route = cleanup ? *route : NULL;
return latency;
}
+static int surf_parse_models_setup_already_called=0;
+/* Call the last initialization functions, that must be called after the
+ * <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
+ */
+void surf_parse_models_setup()
+{
+ if (surf_parse_models_setup_already_called)
+ return;
+ surf_parse_models_setup_already_called=1;
+ surf_config_models_setup();
+}
+
+
/**
* \brief Recursive function for finalize
*
xbt_dict_free(&tmp_sons);
xbt_free(tmp_name);
xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"",
- current_routing->name);
+ current_routing->name);
(*(rc->finalize)) (rc);
}
}
*/
static void finalize(void)
{
- /* delete recursibly all the tree */
+ /* delete recursively all the tree */
_finalize(global_routing->root);
/* delete last_route */
xbt_dynar_free(&(global_routing->last_route));
/* delete global routing structure */
xbt_free(global_routing);
+ /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */
+ surf_parse_models_setup_already_called = 0;
}
static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc)
}
e_surf_network_element_type_t get_network_element_type(const char
- *name)
+ *name)
{
network_element_info_t rc = NULL;
current_routing = NULL;
/* parse generic elements */
- surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML);
- surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML);
- surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router_XML);
+ sg_platf_host_add_cb(parse_S_host);
+ sg_platf_router_add_cb(parse_S_router);
surfxml_add_callback(STag_surfxml_route_cb_list,
- &parse_S_route_new_and_endpoints_XML);
+ &parse_S_route_new_and_endpoints_XML);
surfxml_add_callback(STag_surfxml_ASroute_cb_list,
- &parse_S_ASroute_new_and_endpoints);
+ &parse_S_ASroute_new_and_endpoints);
surfxml_add_callback(STag_surfxml_bypassRoute_cb_list,
- &parse_S_bypassRoute_new_and_endpoints);
+ &parse_S_bypassRoute_new_and_endpoints);
surfxml_add_callback(ETag_surfxml_link_ctn_cb_list,
- &parse_E_link_ctn_new_elem_XML);
+ &parse_E_link_ctn_new_elem_XML);
surfxml_add_callback(ETag_surfxml_route_cb_list,
- &parse_E_route_store_route);
+ &parse_E_route_store_route);
surfxml_add_callback(ETag_surfxml_ASroute_cb_list,
- &parse_E_ASroute_store_route);
+ &parse_E_ASroute_store_route);
surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list,
- &parse_E_bypassRoute_store_route);
-
- surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
- surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
+ &parse_E_bypassRoute_store_route);
surfxml_add_callback(STag_surfxml_cluster_cb_list,
- &routing_parse_Scluster);
-
- surfxml_add_callback(STag_surfxml_peer_cb_list,
- &routing_parse_Speer);
+ &routing_parse_Scluster);
- surfxml_add_callback(ETag_surfxml_platform_cb_list,
- &clean_dict_random);
+ sg_platf_peer_add_cb(routing_parse_Speer); // FIXME: inline in the sg_platf_new_peer instead
+ sg_platf_postparse_add_cb(clean_routing_after_parse);
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
void surf_parse_add_callback_config(void)
{
- surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
- surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
- surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup);
- surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
+ surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
}
-void surf_parse_models_setup()
-{
- routing_parse_Erandom();
- surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup);
- surf_config_models_setup(platform_filename);
- free(platform_filename);
-}
/* ************************************************** */
/* ********** PATERN FOR NEW ROUTING **************** */
/* ************************* GENERIC PARSE FUNCTIONS ************************ */
void generic_set_processing_unit(routing_component_t rc,
- const char *name)
+ const char *name)
{
XBT_DEBUG("Load process unit \"%s\"", name);
int *id = xbt_new0(int, 1);
}
void generic_set_autonomous_system(routing_component_t rc,
- const char *name)
+ const char *name)
{
XBT_DEBUG("Load Autonomous system \"%s\"", name);
int *id = xbt_new0(int, 1);
}
void generic_set_bypassroute(routing_component_t rc,
- const char *src, const char *dst,
- route_extended_t e_route)
+ const char *src, const char *dst,
+ route_extended_t e_route)
{
XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
route_name = bprintf("%s#%s", src, dst);
xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0,
- "Invalid count of links, must be greater than zero (%s,%s)",
- src, dst);
+ "Invalid count of links, must be greater than zero (%s,%s)",
+ src, dst);
xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
- "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
- src, e_route->src_gateway, dst, e_route->dst_gateway);
+ "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
+ src, e_route->src_gateway, dst, e_route->dst_gateway);
route_extended_t new_e_route =
generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0);
xbt_free(e_route);
xbt_dict_set(dict_bypassRoutes, route_name, new_e_route,
- (void (*)(void *)) generic_free_extended_route);
+ (void (*)(void *)) generic_free_extended_route);
xbt_free(route_name);
}
/* *********************** GENERIC BUSINESS METHODS ************************* */
double generic_get_link_latency(routing_component_t rc,
- const char *src, const char *dst,
- route_extended_t route)
+ const char *src, const char *dst,
+ route_extended_t route)
{
- int need_to_clean = route?0:1;
- void * link;
- unsigned int i;
- double latency = 0.0;
+ int need_to_clean = route?0:1;
+ void * link;
+ unsigned int i;
+ double latency = 0.0;
- route = route?route:rc->get_route(rc,src,dst);
+ route = route?route:rc->get_route(rc,src,dst);
- xbt_dynar_foreach(route->generic_route.link_list,i,link) {
- latency += get_link_latency(link);
- }
- if(need_to_clean) generic_free_extended_route(route);
+ xbt_dynar_foreach(route->generic_route.link_list,i,link) {
+ latency += get_link_latency(link);
+ }
+ if(need_to_clean) generic_free_extended_route(route);
return latency;
}
}
route_extended_t generic_get_bypassroute(routing_component_t rc,
- const char *src,
- const char *dst)
+ const char *src,
+ const char *dst)
{
xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
routing_component_t src_as, dst_as;
if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
if(src_data == NULL || dst_data == NULL)
- xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
- src, dst, rc->name);
+ xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
+ src, dst, rc->name);
src_as = ((network_element_info_t)src_data)->rc_component;
dst_as = ((network_element_info_t)dst_data)->rc_component;
for (i = 0; i < max; i++) {
if (i <= max_index_src && max <= max_index_dst) {
char *route_name = bprintf("%s#%s",
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_src, i)))->name,
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_dst, max)))->name);
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_src, i)))->name,
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_dst, max)))->name);
e_route_bypass =
xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
break;
if (max <= max_index_src && i <= max_index_dst) {
char *route_name = bprintf("%s#%s",
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_src, max)))->name,
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_dst, i)))->name);
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_src, max)))->name,
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_dst, i)))->name);
e_route_bypass =
xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
if (max <= max_index_src && max <= max_index_dst) {
char *route_name = bprintf("%s#%s",
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_src, max)))->name,
- (*(routing_component_t *)
- (xbt_dynar_get_ptr
- (path_dst, max)))->name);
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_src, max)))->name,
+ (*(routing_component_t *)
+ (xbt_dynar_get_ptr
+ (path_dst, max)))->name);
e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
}
route_t
generic_new_route(e_surf_routing_hierarchy_t hierarchy,
- void *data, int order)
+ void *data, int order)
{
char *link_name;
xbt_dynar_new(global_routing->size_of_link, NULL);
xbt_assert(hierarchy == SURF_ROUTING_BASE,
- "the hierarchy type is not SURF_ROUTING_BASE");
+ "the hierarchy type is not SURF_ROUTING_BASE");
links = ((route_t) data)->link_list;
xbt_dynar_foreach(links, cpt, link_name) {
void *link =
- xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
if (link) {
if (order)
xbt_dynar_push(links_id, &link);
route_extended_t
generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
- void *data, int order)
+ void *data, int order)
{
char *link_name;
new_e_route->dst_gateway = NULL;
xbt_assert(hierarchy == SURF_ROUTING_BASE
- || hierarchy == SURF_ROUTING_RECURSIVE,
- "the hierarchy type is not defined");
+ || hierarchy == SURF_ROUTING_RECURSIVE,
+ "the hierarchy type is not defined");
if (hierarchy == SURF_ROUTING_BASE) {
e_route = (route_extended_t) data;
xbt_assert(e_route->src_gateway
- && e_route->dst_gateway, "bad gateway, is null");
+ && e_route->dst_gateway, "bad gateway, is null");
links = e_route->generic_route.link_list;
/* remeber not erase the gateway names */
xbt_dynar_foreach(links, cpt, link_name) {
void *link =
- xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
if (link) {
if (order)
xbt_dynar_push(links_id, &link);
}
static routing_component_t generic_as_exist(routing_component_t find_from,
- routing_component_t to_find)
+ routing_component_t to_find)
{
//return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
xbt_dict_cursor_t cursor = NULL;
xbt_dict_cursor_t cursor = NULL;
char *key;
element_as = ((network_element_info_t)
- xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component;
+ xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component;
result = ((routing_component_t) - 1);
if (element_as != rc)
result = generic_as_exist(rc, element_as);
{
routing_component_t element_as;
element_as = ((network_element_info_t)
- xbt_lib_get_or_null(host_lib,
- element, ROUTING_HOST_LEVEL))->rc_component;
+ xbt_lib_get_or_null(host_lib,
+ element, ROUTING_HOST_LEVEL))->rc_component;
if (element_as == rc)
return element_as;
return generic_as_exist(rc, element_as);
}
void generic_src_dst_check(routing_component_t rc, const char *src,
- const char *dst)
+ const char *dst)
{
void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL);
if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
if(src_data == NULL || dst_data == NULL)
- xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
- src, dst, rc->name);
+ xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
+ src, dst, rc->name);
routing_component_t src_as = ((network_element_info_t)src_data)->rc_component;
routing_component_t dst_as = ((network_element_info_t)dst_data)->rc_component;
if(src_as != dst_as)
- xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
- src, src_as->name, dst, dst_as->name);
+ xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
+ src, src_as->name, dst, dst_as->name);
if(rc != dst_as)
- xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)",
- src,dst,src_as->name, dst_as->name,rc->name);
+ xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)",
+ src,dst,src_as->name, dst_as->name,rc->name);
}
-static void routing_parse_Sconfig(void)
-{
- XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
-}
-
-static void routing_parse_Econfig(void)
-{
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- char *elem;
- char *cfg;
- xbt_dict_foreach(current_property_set, cursor, key, elem) {
- cfg = bprintf("%s:%s",key,elem);
- if(xbt_cfg_is_default_value(_surf_cfg_set, key))
- xbt_cfg_set_parse(_surf_cfg_set, cfg);
- else
- XBT_INFO("The custom configuration '%s' is already define by user!",key);
- free(cfg);
- }
- XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
-}
-
-void routing_parse_Scluster(void)
-{
- static int AX_ptr = 0;
+void routing_parse_Scluster(void) {
char *host_id, *groups, *link_id = NULL;
- char *availability_file = xbt_strdup(A_surfxml_cluster_availability_file);
- char *state_file = xbt_strdup(A_surfxml_cluster_state_file);
-
- if(xbt_dict_size(patterns)==0)
- patterns = xbt_dict_new();
- xbt_dict_set(patterns,"id",struct_cluster->V_cluster_id,NULL);
- xbt_dict_set(patterns,"prefix",struct_cluster->V_cluster_prefix,NULL);
- xbt_dict_set(patterns,"suffix",struct_cluster->V_cluster_suffix,NULL);
+ s_sg_platf_host_cbarg_t host;
+ s_sg_platf_link_cbarg_t link;
+
+ if( strcmp(struct_cluster->availability_trace,"")
+ || strcmp(struct_cluster->state_trace,"") )
+ {
+ if(xbt_dict_size(patterns)==0)
+ patterns = xbt_dict_new();
+ xbt_dict_set(patterns,"id",xbt_strdup(struct_cluster->id),free);
+ xbt_dict_set(patterns,"prefix",xbt_strdup(struct_cluster->prefix),free);
+ xbt_dict_set(patterns,"suffix",xbt_strdup(struct_cluster->suffix),free);
+ }
- char *route_src_dst;
unsigned int iter;
int start, end, i;
xbt_dynar_t radical_elements;
xbt_dynar_t radical_ends;
- int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
- int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
-
- static unsigned int surfxml_buffer_stack_stack_ptr = 1;
- static unsigned int surfxml_buffer_stack_stack[1024];
-
- surfxml_buffer_stack_stack[0] = 0;
-
- surfxml_bufferstack_push(1);
- SURFXML_BUFFER_SET(AS_id, struct_cluster->V_cluster_id);
- SURFXML_BUFFER_SET(AS_routing, "RuleBased");
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", struct_cluster->V_cluster_id);
- SURFXML_START_TAG(AS);
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", struct_cluster->id);
+ sg_platf_new_AS_open(struct_cluster->id,"Cluster");
- radical_elements = xbt_str_split(struct_cluster->V_cluster_radical, ",");
+ //Make all hosts
+ radical_elements = xbt_str_split(struct_cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
+ memset(&host,0,sizeof(host));
+
radical_ends = xbt_str_split(groups, "-");
switch (xbt_dynar_length(radical_ends)) {
case 1:
- surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
- host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix);
- link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start);
- xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
- A_surfxml_host_state = A_surfxml_host_state_ON;
-
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, struct_cluster->S_cluster_power);
- SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, struct_cluster->S_cluster_power);
-
- if(!strcmp(A_surfxml_cluster_availability_file,"")){
- char* tmp_availability_file = xbt_strdup(availability_file);
- xbt_str_varsubst(tmp_availability_file,patterns);
- XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
- SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
- xbt_free(tmp_availability_file);
+ start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+ host_id = bprintf("%s%d%s", struct_cluster->prefix, start, struct_cluster->suffix);
+ link_id = bprintf("%s_link_%d", struct_cluster->id, start);
+
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->power);
+ host.id = host_id;
+ if(strcmp(struct_cluster->availability_trace,"")){
+ xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
+ char* tmp_availability_file = xbt_strdup(struct_cluster->availability_trace);
+ xbt_str_varsubst(tmp_availability_file,patterns);
+ XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+ host.power_trace = tmgr_trace_new(tmp_availability_file);
+ xbt_free(tmp_availability_file);
}
else
{
- XBT_DEBUG("\tavailability_file=\"\"");
- SURFXML_BUFFER_SET(host_availability_file, "");
+ XBT_DEBUG("\tavailability_file=\"\"");
}
- if(!strcmp(A_surfxml_cluster_state_file,"")){
- char *tmp_state_file = xbt_strdup(state_file);
- xbt_str_varsubst(tmp_state_file,patterns);
- XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
- SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
- xbt_free(tmp_state_file);
+ if(strcmp(struct_cluster->state_trace,"")){
+ char *tmp_state_file = xbt_strdup(struct_cluster->state_trace);
+ xbt_str_varsubst(tmp_state_file,patterns);
+ XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+ host.state_trace = tmgr_trace_new(tmp_state_file);
+ xbt_free(tmp_state_file);
}
else
{
- XBT_DEBUG("\tstate_file=\"\"");
- SURFXML_BUFFER_SET(host_state_file, "");
+ XBT_DEBUG("\tstate_file=\"\"");
}
- SURFXML_BUFFER_SET(host_core, struct_cluster->S_cluster_core);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_coordinates, "");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
+ host.power_peak = struct_cluster->power;
+ host.power_scale = 1.0;
+ host.core_amount = struct_cluster->core_amount;
+ host.initial_state = SURF_RESOURCE_ON;
+ host.coord = "";
+ sg_platf_new_host(&host);
XBT_DEBUG("</host>");
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
-
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
-
- SURFXML_BUFFER_SET(link_id, link_id);
- SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bw);
- SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
-
- free(link_id);
- free(host_id);
- break;
- case 2:
-
- surf_parse_get_int(&start,
- xbt_dynar_get_as(radical_ends, 0, char *));
- surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
- for (i = start; i <= end; i++) {
- host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix);
- link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i);
- xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
- A_surfxml_host_state = A_surfxml_host_state_ON;
-
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, struct_cluster->S_cluster_power);
- SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, struct_cluster->S_cluster_power);
-
- if(!strcmp(A_surfxml_cluster_availability_file,"")){
- char* tmp_availability_file = xbt_strdup(availability_file);
- xbt_str_varsubst(tmp_availability_file,patterns);
- XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
- SURFXML_BUFFER_SET(host_availability_file, tmp_availability_file);
- xbt_free(tmp_availability_file);
- }
- else
- {
- XBT_DEBUG("\tavailability_file=\"\"");
- SURFXML_BUFFER_SET(host_availability_file, "");
- }
- if(!strcmp(A_surfxml_cluster_state_file,"")){
- char *tmp_state_file = xbt_strdup(state_file);
- xbt_str_varsubst(tmp_state_file,patterns);
- XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
- SURFXML_BUFFER_SET(host_state_file, tmp_state_file);
- xbt_free(tmp_state_file);
- }
- else
- {
- XBT_DEBUG("\tstate_file=\"\"");
- SURFXML_BUFFER_SET(host_state_file, "");
- }
-
- SURFXML_BUFFER_SET(host_core, struct_cluster->S_cluster_core);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_coordinates, "");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
- XBT_DEBUG("</host>");
-
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
-
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
-
- SURFXML_BUFFER_SET(link_id, link_id);
- SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bw);
- SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
-
- free(link_id);
- free(host_id);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->bw, struct_cluster->lat);
+
+ memset(&link,0,sizeof(link));
+ link.id = link_id;
+ link.bandwidth = struct_cluster->bw;
+ link.latency = struct_cluster->lat;
+ link.state = SURF_RESOURCE_ON;
+
+ switch (struct_cluster->sharing_policy) {
+ case A_surfxml_cluster_sharing_policy_FATPIPE:
+ link.policy = SURF_LINK_FATPIPE;
+ break;
+ case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
+ link.policy = SURF_LINK_FULLDUPLEX;
+ break;
+ default:
+ link.policy = SURF_LINK_SHARED;
}
- break;
- default:
- XBT_DEBUG("Malformed radical");
+ sg_platf_new_link(&link);
+
+ surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+ if (struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX){
+ char* tmp_link = bprintf("%s_UP",link_id);
+ info->link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ tmp_link = bprintf("%s_DOWN",link_id);
+ info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }
+ else{
+ info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
+ info->link_down = info->link_up;
+ }
+ surf_routing_cluster_add_link(host_id,info);
+ xbt_free(link_id);
+ xbt_free(host_id);
+
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++) {
+ host_id = bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix);
+ link_id = bprintf("%s_link_%d", struct_cluster->id, i);
+
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->power);
+ host.id = host_id;
+ if(strcmp(struct_cluster->availability_trace,"")){
+ xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+ char* tmp_availability_file = xbt_strdup(struct_cluster->availability_trace);
+ xbt_str_varsubst(tmp_availability_file,patterns);
+ XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file);
+ host.power_trace = tmgr_trace_new(tmp_availability_file);
+ xbt_free(tmp_availability_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tavailability_file=\"\"");
+ }
+ if(strcmp(struct_cluster->state_trace,"")){
+ char *tmp_state_file = xbt_strdup(struct_cluster->state_trace);
+ xbt_str_varsubst(tmp_state_file,patterns);
+ XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file);
+ host.state_trace = tmgr_trace_new(tmp_state_file);
+ xbt_free(tmp_state_file);
+ }
+ else
+ {
+ XBT_DEBUG("\tstate_file=\"\"");
+ }
+
+ host.power_peak = struct_cluster->power;
+ host.power_scale = 1.0;
+ host.core_amount = struct_cluster->core_amount;
+ host.initial_state = SURF_RESOURCE_ON;
+ host.coord = "";
+ sg_platf_new_host(&host);
+ XBT_DEBUG("</host>");
+
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->bw, struct_cluster->lat);
+
+ memset(&link,0,sizeof(link));
+ link.id = link_id;
+ link.bandwidth = struct_cluster->bw;
+ link.latency = struct_cluster->lat;
+ link.state = SURF_RESOURCE_ON;
+
+ switch (struct_cluster->sharing_policy) {
+ case A_surfxml_cluster_sharing_policy_SHARED:
+ link.policy = SURF_LINK_SHARED;
+ break;
+ case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
+ link.policy = SURF_LINK_FULLDUPLEX;
+ break;
+ case A_surfxml_cluster_sharing_policy_FATPIPE:
+ link.policy = SURF_LINK_FATPIPE;
+ break;
+ default:
+ surf_parse_error(bprintf("Invalid cluster sharing policy for cluster %s",struct_cluster->id));
+ }
+ sg_platf_new_link(&link);
+
+ surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+ if (link.policy == SURF_LINK_FULLDUPLEX) {
+ char* tmp_link = bprintf("%s_UP",link_id);
+ info->link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ tmp_link = bprintf("%s_DOWN",link_id);
+ info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
+ free(tmp_link);
+ }
+ else{
+ info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
+ info->link_down = info->link_up;
+ }
+ surf_routing_cluster_add_link(host_id,info);
+
+ xbt_free(link_id);
+ xbt_free(host_id);
+
+ }
+ break;
+
+ default:
+ XBT_DEBUG("Malformed radical");
+ break;
}
xbt_dynar_free(&radical_ends);
}
xbt_dynar_free(&radical_elements);
+ // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together
XBT_DEBUG(" ");
- XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->S_cluster_router_id);
- SURFXML_BUFFER_SET(router_id, struct_cluster->S_cluster_router_id);
- SURFXML_BUFFER_SET(router_coordinates, "");
- SURFXML_START_TAG(router);
- SURFXML_END_TAG(router);
-
- if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
- char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
- XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat);
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
- SURFXML_BUFFER_SET(link_id, link_backbone);
- SURFXML_BUFFER_SET(link_bandwidth, struct_cluster->S_cluster_bb_bw);
- SURFXML_BUFFER_SET(link_latency, struct_cluster->S_cluster_bb_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
- free(link_backbone);
+ XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->router_id);
+ s_sg_platf_router_cbarg_t router;
+ char *newid=NULL;
+ memset(&router,0,sizeof(router));
+ router.id = struct_cluster->router_id;
+ router.coord = "";
+ if (!router.id || !strcmp(router.id,""))
+ router.id = newid = bprintf("%s%s_router%s", struct_cluster->prefix, struct_cluster->id, struct_cluster->suffix);
+ sg_platf_new_router(&router);
+ if (newid)
+ free(newid);
+
+ //Make the backbone
+ if( (struct_cluster->bb_bw!= 0) && (struct_cluster->bb_lat!=0) ){
+ char *link_backbone = bprintf("%s_backbone", struct_cluster->id);
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link_backbone,struct_cluster->bb_bw, struct_cluster->bb_lat);
+
+ memset(&link,0,sizeof(link));
+ link.id = link_backbone;
+ link.bandwidth = struct_cluster->bb_bw;
+ link.latency = struct_cluster->bb_lat;
+ link.state = SURF_RESOURCE_ON;
+
+ switch (struct_cluster->bb_sharing_policy) {
+ case A_surfxml_cluster_bb_sharing_policy_FATPIPE:
+ link.policy = SURF_LINK_FATPIPE;
+ break;
+ case A_surfxml_cluster_bb_sharing_policy_SHARED:
+ link.policy = SURF_LINK_SHARED;
+ break;
+ default:
+ surf_parse_error(bprintf("Invalid bb sharing policy in cluster %s",struct_cluster->id));
+ }
+
+ sg_platf_new_link(&link);
+
+ surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
+ info->link_up = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
+ info->link_down = info->link_up;
+ surf_routing_cluster_add_link(struct_cluster->id, info);
+
+ free(link_backbone);
}
XBT_DEBUG(" ");
char *new_suffix = xbt_strdup("");
- radical_elements = xbt_str_split(struct_cluster->V_cluster_suffix, ".");
+ radical_elements = xbt_str_split(struct_cluster->suffix, ".");
xbt_dynar_foreach(radical_elements, iter, groups) {
if (strcmp(groups, "")) {
char *old_suffix = new_suffix;
free(old_suffix);
}
}
- route_src_dst = bprintf("%s(.*)%s", struct_cluster->V_cluster_prefix, new_suffix);
+
xbt_dynar_free(&radical_elements);
xbt_free(new_suffix);
- char *pcre_link_src = bprintf("%s_link_$1src", struct_cluster->V_cluster_id);
- char *pcre_link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
- char *pcre_link_dst = bprintf("%s_link_$1dst", struct_cluster->V_cluster_id);
-
- //from router to router
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", struct_cluster->S_cluster_router_id, struct_cluster->S_cluster_router_id);
- XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, struct_cluster->S_cluster_router_id);
- SURFXML_BUFFER_SET(route_dst, struct_cluster->S_cluster_router_id);
- A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
- SURFXML_START_TAG(route);
-
- if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
- }
-
- XBT_DEBUG("</route>");
- SURFXML_END_TAG(route);
-
- //from host to router
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, struct_cluster->S_cluster_router_id);
- XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, route_src_dst);
- SURFXML_BUFFER_SET(route_dst, struct_cluster->S_cluster_router_id);
- A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
- SURFXML_START_TAG(route);
-
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_src);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
-
- if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
- }
-
- XBT_DEBUG("</route>");
- SURFXML_END_TAG(route);
-
- //from router to host
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", struct_cluster->S_cluster_router_id, route_src_dst);
- XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, struct_cluster->S_cluster_router_id);
- SURFXML_BUFFER_SET(route_dst, route_src_dst);
- A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
- SURFXML_START_TAG(route);
-
- if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
- }
-
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
-
- XBT_DEBUG("</route>");
- SURFXML_END_TAG(route);
-
- //from host to host
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
- XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, route_src_dst);
- SURFXML_BUFFER_SET(route_dst, route_src_dst);
- A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
- SURFXML_START_TAG(route);
-
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_src);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
-
- if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
- }
-
- XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
- SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst);
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
-
- XBT_DEBUG("</route>");
- SURFXML_END_TAG(route);
-
- free(pcre_link_dst);
- free(pcre_link_backbone);
- free(pcre_link_src);
- free(route_src_dst);
-
- xbt_free(availability_file);
- xbt_free(state_file);
-
- xbt_dict_free(&patterns);
+ if( strcmp(struct_cluster->availability_trace,"")
+ || strcmp(struct_cluster->state_trace,"") )
+ xbt_dict_free(&patterns);
XBT_DEBUG("</AS>");
- SURFXML_END_TAG(AS);
+ sg_platf_new_AS_close();
XBT_DEBUG(" ");
-
- surfxml_bufferstack_pop(1);
}
/*
* This function take a string and replace parameters from patterns dict.
* It returns the new value.
*/
static char* replace_random_parameter(char * string)
-{
+ {
char *test_string = NULL;
if(xbt_dict_size(random_value)==0)
string = test_string;
} //In other case take old value (without ${})
else
- free(test_string);
+ free(test_string);
return string;
-}
+ }
-static void clean_dict_random(void)
+static void clean_routing_after_parse(void)
{
- xbt_dict_free(&random_value);
- xbt_dict_free(&patterns);
+ xbt_dict_free(&random_value);
+ xbt_dict_free(&patterns);
}
-static void routing_parse_Speer(void)
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer)
{
static int AX_ptr = 0;
char *host_id = NULL;
surfxml_bufferstack_push(1);
- SURFXML_BUFFER_SET(AS_id, struct_peer->V_peer_id);
-
- SURFXML_BUFFER_SET(AS_routing, "Full");
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", struct_peer->V_peer_id);
-
- SURFXML_START_TAG(AS);
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer->id);
+ sg_platf_new_AS_open(peer->id, "Full");
XBT_DEBUG(" ");
- host_id = bprintf("peer_%s", struct_peer->V_peer_id);
- router_id = bprintf("router_%s", struct_peer->V_peer_id);
- link_id_up = bprintf("link_%s_up", struct_peer->V_peer_id);
- link_id_down = bprintf("link_%s_down", struct_peer->V_peer_id);
-
- link_router = bprintf("%s_link_router", struct_peer->V_peer_id);
- link_backbone = bprintf("%s_backbone", struct_peer->V_peer_id);
-
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, struct_peer->V_peer_power);
- A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_id, host_id);
- SURFXML_BUFFER_SET(host_power, struct_peer->V_peer_power);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- SURFXML_BUFFER_SET(host_availability_file, struct_peer->V_peer_availability_trace);
- SURFXML_BUFFER_SET(host_state_file, struct_peer->V_peer_state_trace);
- SURFXML_BUFFER_SET(host_coordinates, "");
- SURFXML_BUFFER_SET(host_core, "1.0");
- SURFXML_START_TAG(host);
- SURFXML_END_TAG(host);
-
- XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, struct_peer->V_peer_coord);
- SURFXML_BUFFER_SET(router_id, router_id);
- SURFXML_BUFFER_SET(router_coordinates, struct_peer->V_peer_coord);
- SURFXML_START_TAG(router);
- SURFXML_END_TAG(router);
-
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, struct_peer->V_peer_bw_in, struct_peer->V_peer_lat);
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- SURFXML_BUFFER_SET(link_id, link_id_up);
- SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_in);
- SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
-
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, struct_peer->V_peer_bw_out, struct_peer->V_peer_lat);
- A_surfxml_link_state = A_surfxml_link_state_ON;
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- SURFXML_BUFFER_SET(link_id, link_id_down);
- SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_out);
- SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat);
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
- SURFXML_BUFFER_SET(link_latency_file, "");
- SURFXML_BUFFER_SET(link_state_file, "");
- SURFXML_START_TAG(link);
- SURFXML_END_TAG(link);
+ host_id = HOST_PEER(peer->id);
+ router_id = ROUTER_PEER(peer->id);
+ link_id_up = LINK_UP_PEER(peer->id);
+ link_id_down = LINK_DOWN_PEER(peer->id);
+
+ link_router = bprintf("%s_link_router", peer->id);
+ link_backbone = bprintf("%s_backbone", peer->id);
+
+ 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;
+ host.power_scale = 1.0;
+ host.power_trace = peer->availability_trace;
+ host.state_trace = peer->state_trace;
+ host.core_amount = 1;
+ sg_platf_new_host(&host);
+
+
+ XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer->coord);
+ 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);
+
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_up, peer->bw_in, peer->lat);
+ s_sg_platf_link_cbarg_t link;
+ memset(&link,0,sizeof(link));
+ link.state = SURF_RESOURCE_ON;
+ link.policy = SURF_LINK_SHARED;
+ link.id = link_id_up;
+ link.bandwidth = peer->bw_in;
+ link.latency = peer->lat;
+ sg_platf_new_link(&link);
+
+ // FIXME: dealing with full duplex is not the role of this piece of code, I'd say [Mt]
+ // Instead, it should be created fullduplex, and the models will do what's needed in this case
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_down, peer->bw_out, peer->lat);
+ link.id = link_id_down;
+ sg_platf_new_link(&link);
XBT_DEBUG(" ");
SURFXML_END_TAG(route);
XBT_DEBUG("</AS>");
- SURFXML_END_TAG(AS);
+ sg_platf_new_AS_close();
XBT_DEBUG(" ");
//xbt_dynar_free(&tab_elements_num);
- free(host_id);
- free(router_id);
- free(link_router);
- free(link_backbone);
- free(link_id_up);
- free(link_id_down);
+ free(host_id);
+ free(router_id);
+ free(link_router);
+ free(link_backbone);
+ free(link_id_up);
+ free(link_id_down);
surfxml_bufferstack_pop(1);
}
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;
- surf_parse_get_double(&mean,A_surfxml_random_mean);
- surf_parse_get_double(&std,A_surfxml_random_std_deviation);
- surf_parse_get_double(&min,A_surfxml_random_min);
- surf_parse_get_double(&max,A_surfxml_random_max);
- surf_parse_get_double(&seed,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;
-
- random->generator = A_surfxml_random_generator;
- 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,
- random->generator,
- random->seed,
- random_radical);
-
- if(xbt_dict_size(random_value)==0)
- random_value = xbt_dict_new();
-
- if(!strcmp(random_radical,""))
- {
- res = random_generate(random);
- rd_value = bprintf("%f",res);
- xbt_dict_set(random_value, random_id, rd_value, free);
- }
- 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), free);
- xbt_free(tmpbuf);
- break;
-
- case 2: surf_parse_get_int(&start,
- xbt_dynar_get_as(radical_ends, 0, char *));
- surf_parse_get_int(&end, 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), free);
- xbt_free(tmpbuf);
- }
- break;
- default:
- XBT_INFO("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, free);
-
- xbt_dynar_free(&radical_ends);
- }
- free(rd_name);
- xbt_dynar_free(&radical_elements);
- }
-}
-
-static void routing_parse_Erandom(void)
-{
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- char *elem;
-
- xbt_dict_foreach(random_value, cursor, key, elem) {
- XBT_DEBUG("%s = %s",key,elem);
- }
-
-}
-
-
-/*
- * New methods to init the routing model component from the lua script
- */
+ 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;
-/*
- * add a host to the network element list
- */
+ random->generator = A_surfxml_random_generator;
+ 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,
+ random->generator,
+ random->seed,
+ random_radical);
-void routing_add_host(const char *host_id)
-{
- parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua
-}
+ if(xbt_dict_size(random_value)==0)
+ random_value = xbt_dict_new();
-/*
- * Set a new link on the actual list of link for a route or ASroute
- */
-void routing_add_link(const char *link_id)
-{
- parse_E_link_c_ctn_new_elem_lua((char *) link_id);
-}
+ if(!strcmp(random_radical,""))
+ {
+ res = random_generate(random);
+ rd_value = bprintf("%f",res);
+ xbt_dict_set(random_value, random_id, rd_value, free);
+ }
+ 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), free);
+ xbt_free(tmpbuf);
+ break;
-/*
- *Set the endpoints for a route
- */
-void routing_set_route(const char *src_id, const char *dst_id)
-{
- parse_S_route_new_and_endpoints_lua(src_id, dst_id);
-}
+ 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), free);
+ xbt_free(tmpbuf);
+ }
+ break;
+ default:
+ XBT_INFO("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, free);
-/*
- * Store the route by calling parse_E_route_store_route
- */
-void routing_store_route(void)
-{
- parse_E_route_store_route();
+ xbt_dynar_free(&radical_ends);
+ }
+ free(rd_name);
+ xbt_dynar_free(&radical_elements);
+ }
}
