From 0042a96b1c7fe6b48b6e1594b0c17eec22bcba2d Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 28 Feb 2011 14:30:24 +0000 Subject: [PATCH 1/1] Revert "Remove lua parse functions from simgrid." This reverts commit 951fae21a458e44d405f5a4dfef91dbb16a012ab. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9738 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 26 +++++++++++ src/surf/surf_routing.c | 95 ++++++++++++++++++++++++++++++++++++++++ src/surf/surfxml_parse.c | 40 +++++++++++++++++ 3 files changed, 161 insertions(+) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 1281eb6c2a..af144b6828 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -762,6 +762,32 @@ XBT_PUBLIC(void) surf_add_host_traces(void); XBT_PUBLIC(void) surf_add_link_traces(void); XBT_PUBLIC(void) surf_wsL07_add_traces(void); +/* + * init AS from lua console + * see surf_routing.c + */ +XBT_PUBLIC(void) routing_AS_init(const char *id, const char *mode); +XBT_PUBLIC(void) routing_AS_end(const char *id); +// add host to network element list +XBT_PUBLIC(void) routing_add_host(const char *host_id); +//Set a new link on the actual list of link for a route or ASroute +XBT_PUBLIC(void) routing_add_link(const char *link_id); +//Set the endpoints for a route +XBT_PUBLIC(void) routing_set_route(const char *src_id, const char *dst_id); +//Store the route +XBT_PUBLIC(void) routing_store_route(void); + +/* + * interface between surf and lua bindings + * see surfxml_parse.c + */ +XBT_PUBLIC(void) surf_AS_new(const char *id, const char *mode); +XBT_PUBLIC(void) surf_AS_finalize(const char *id); +XBT_PUBLIC(void) surf_route_add_host(const char *id); +XBT_PUBLIC(void) surf_routing_add_route(const char *src_id, + const char *dest_id, + xbt_dynar_t links_id); + #include "surf/surf_resource.h" #include "surf/surf_resource_lmm.h" diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 45d863e651..688156c0f7 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -262,6 +262,14 @@ 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 @@ -319,6 +327,14 @@ 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 */ @@ -388,6 +404,14 @@ 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 */ @@ -531,6 +555,15 @@ 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 * @@ -569,6 +602,14 @@ 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 */ /** @@ -3941,3 +3982,57 @@ 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(); +} diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 250ee7e448..ad572ce2a2 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -694,6 +694,46 @@ void surf_wsL07_link_create_resource(char *name, properties); } +/** + * + *init new routing model component + */ + +void surf_AS_new(const char *AS_id, const char *AS_mode) +{ + routing_AS_init(AS_id, AS_mode); +} + +void surf_AS_finalize(const char *AS_id) +{ + routing_AS_end(AS_id); +} + +/* + * add host to the network element list + */ +void surf_route_add_host(const char *host_id) +{ + routing_add_host(host_id); +} + +/** + * set route + */ +void surf_routing_add_route(const char *src_id, const char *dst_id, + xbt_dynar_t links_id) +{ + unsigned int i; + const char *link_id; + routing_set_route(src_id, dst_id); + xbt_dynar_foreach(links_id, i, link_id) { + routing_add_link(link_id); + } + + //store the route + routing_store_route(); +} + /** * Add Traces */ -- 2.20.1