X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7773b1a6861c8a02475febf1e14a1cedf56bed02..ae943ce975f323351c52acbfa5045ff064fae451:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index f1a26237fb..564fe1daa4 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -262,14 +262,6 @@ 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 @@ -327,14 +319,6 @@ static void parse_S_route_new_and_endpoints_XML(void) 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 */ @@ -404,14 +388,6 @@ static void parse_E_link_ctn_new_elem_XML(void) } } -/** - * \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 */ @@ -555,15 +531,6 @@ static void parse_S_AS_XML(void) } } -/* - * 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 * @@ -602,14 +569,6 @@ static void parse_E_AS_XML(void) 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 */ /** @@ -3982,57 +3941,3 @@ static void routing_parse_Erandom(void) } } - - -/* - * 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(); -}