From 948e3ea28edffde7ce1896d540a73c27506ea897 Mon Sep 17 00:00:00 2001 From: coldpeace Date: Fri, 1 Oct 2010 17:08:43 +0000 Subject: [PATCH 1/1] add new methods to reimplement the lua console respecting the new routing model git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8326 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 55e83c0af1..40f1bf65bf 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -735,13 +735,9 @@ XBT_PUBLIC(void) surf_add_route_element(char *link_ctn_id); * * see surf_routing.c && surfxml_parse.c */ -XBT_PUBLIC(void) surf_route_set_resource(char* src_id,char *dest_id,xbt_dynar_t links_id,int action); + XBT_PUBLIC(void) surf_set_routes(void); -/** - * add host to routing model ( xbt_dict ) - * - */ -XBT_PUBLIC(void) surf_route_add_host(char * host_id); + /** * add traces @@ -751,6 +747,30 @@ 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(); + +/* + * 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" -- 2.20.1