/**
* \brief Add a "host" to the network element list
*/
-static void parse_S_host(const char *host_id, const char* coord)
+void parse_S_host(const char *host_id, const char* coord)
{
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
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
/**
* \brief Set the endponints for a route
*/
-static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
+void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
{
if (src != NULL && dst != NULL && link_list != NULL)
THROW2(arg_error, 0, "Route between %s to %s can not be defined",
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
*/
-static void parse_E_link_ctn_new_elem(const char *link_id)
+void parse_E_link_ctn_new_elem(const char *link_id)
{
char *val;
val = xbt_strdup(link_id);
}
}
+/**
+ * \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
*/
-static void parse_E_route_store_route(void)
+void parse_E_route_store_route(void)
{
name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
route->generic_route.link_list = link_list;
* make the new structure and
* set the parsing functions to allows parsing the part of the routing tree
*/
-static void parse_S_AS(char *AS_id, char *AS_routing)
+void parse_S_AS(char *AS_id, char *AS_routing)
{
routing_component_t new_routing;
model_type_t model = NULL;
}
}
+/*
+ * 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
*
* 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
*/
-static void parse_E_AS(const char *AS_id)
+void parse_E_AS(const char *AS_id)
{
if (current_routing == NULL) {
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 */
/**
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 =
}
}
+
+
+/*
+ * 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();
+}