static void routing_parse_Econfig(void); /*config Tag */
static char* replace_random_parameter(char * chaine);
+static void clean_dict_random(void);
/* this lines are only for replace use like index in the model table */
typedef enum {
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
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);
+}
+
/**
* \brief Set the endponints and gateways for a ASroute
*/
}
}
+/**
+ * \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
*/
}
}
+/*
+ * define the routing model type of routing component from lua script
+ */
+static void parse_S_AS_lua(char *id, char *mode)
+{
+ parse_S_AS(id, mode);
+}
+
+
/**
* \brief Finish the creation of a new routing component
*
parse_E_AS(A_surfxml_AS_id);
}
+/*
+ * \brief Finish the creation of a new routing component from lua
+ */
+static void parse_E_AS_lua(const char *id)
+{
+ parse_E_AS(id);
+}
+
/* Aux Business methods */
/**
return recursive_get_onelink_routes(global_routing->root);
}
-static e_surf_network_element_type_t get_network_element_type(const char
+e_surf_network_element_type_t get_network_element_type(const char
*name)
{
network_element_info_t rc = NULL;
- rc = xbt_dict_get(global_routing->where_network_elements, name);
+ rc = xbt_dict_get_or_null(global_routing->where_network_elements, name);
+ if(!rc) return SURF_NETWORK_ELEMENT_NULL;
return rc->rc_type;
}
surfxml_add_callback(STag_surfxml_peer_cb_list,
&routing_parse_Speer);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list,
+ &clean_dict_random);
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
- xbt_dynar_free(&link_route_to_test);
}
else
{
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
+ else{
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
}
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
- xbt_dynar_free(&link_route_to_test);
}
else
{
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
- xbt_free(link_route_to_test);
}
else
{
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
- XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ else{
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
-
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
TO_FLOYD_LINK(*src_id, *dst_id) =
generic_new_extended_route(rc->hierarchy, route, 1);
TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
- xbt_free(link_route_to_test);
}
else
{
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
new_component->generic_routing.set_route = model_dijkstra_both_set_route;
- new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO
+ new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = dijkstra_get_route;
new_component->generic_routing.get_latency = generic_get_link_latency;
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
+ else{
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
route_extended_t e_route =
generic_new_extended_route(current_routing->hierarchy, route, 1);
int ovector_dst[OVECCOUNT];
const char **list_src = NULL;
const char **list_dst = NULL;
+ int res;
xbt_dynar_foreach(rule_list, cpt, ruleroute) {
rc_src =
pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0,
ovector_dst, OVECCOUNT);
if (rc_dst >= 0) {
- xbt_assert1(!pcre_get_substring_list
- (src, ovector_src, rc_src, &list_src),
- "error solving substring list for src \"%s\"", src);
- xbt_assert1(!pcre_get_substring_list
- (dst, ovector_dst, rc_dst, &list_dst),
- "error solving substring list for src \"%s\"", dst);
+ res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
+ res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", dst);
char *link_name;
xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
char *new_link_name =
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);
}
xbt_free(temp_cluster_bw);
xbt_free(temp_cluster_lat);
+ xbt_free(temp_cluster_power);
free(link_id);
free(host_id);
break;
xbt_free(string);
string = test_string;
} //In other case take old value (without ${})
-
+ else
+ free(test_string);
return string;
}
+static void clean_dict_random(void)
+{
+ XBT_DEBUG("Clean dict for random");
+ xbt_dict_free(&random_value);
+ xbt_dict_free(&patterns);
+}
+
static void routing_parse_Speer(void)
{
static int AX_ptr = 0;
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);
if(!strcmp(random_radical,""))
{
res = random_generate(random);
- xbt_dict_set(random_value, random_id, bprintf("%f",res), free);
+ rd_value = bprintf("%f",res);
+ xbt_dict_set(random_value, random_id, rd_value, free);
}
else
{
for (i = start; i <= end; i++) {
xbt_assert1(!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);
+ tmpbuf = bprintf("%s%d",random_id,i);
xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);
- xbt_free(tmpbuf);
+ xbt_free(tmpbuf);
}
break;
default:
XBT_INFO("Malformed radical");
}
res = random_generate(random);
- xbt_dict_set(random_value, bprintf("%s_router",random_id), bprintf("%f",res), free);
+ 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);
}
}
}
}
+
+
+/*
+ * New methods to init the routing model component from the lua script
+ */
+
+/*
+ * calling parse_S_AS_lua with lua values
+ */
+void routing_AS_init(const char *AS_id, const char *AS_routing)
+{
+ parse_S_AS_lua((char *) AS_id, (char *) AS_routing);
+}
+
+/*
+ * calling parse_E_AS_lua to fisnish the creation of routing component
+ */
+void routing_AS_end(const char *AS_id)
+{
+ parse_E_AS_lua((char *) AS_id);
+}
+
+/*
+ * add a host to the network element list
+ */
+
+void routing_add_host(const char *host_id)
+{
+ parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua
+}
+
+/*
+ * 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);
+}
+
+/*
+ *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);
+}
+
+/*
+ * Store the route by calling parse_E_route_store_route
+ */
+void routing_store_route(void)
+{
+ parse_E_route_store_route();
+}