add generic acess function to routing model, to call routing_full_parse_end and set...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8061 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index aecdb54..e39025e 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -689,18 +689,19 @@ XBT_PUBLIC(void) surf_add_route_element(char *link_ctn_id);
  * see surf_routing.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
  */
-XBT_PUBLIC(void) surf_add_trace_cpu(void);
-XBT_PUBLIC(void) surf_add_trace_link(void);
+XBT_PUBLIC(void) surf_add_host_traces(void);
+XBT_PUBLIC(void) surf_add_link_traces(void);
 
 #include "surf/surf_resource.h"
 #include "surf/surf_resource_lmm.h"

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 564f141..c64d330 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -114,8 +114,9 @@ XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
  * generic methods to create resources bypassing the parser
  * FIXME : better if added to the routing model instead
  */
-XBT_PUBLIC(void) routing_set_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action);
+XBT_PUBLIC(void) routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action);
 XBT_PUBLIC(void) routing_add_host(char* host_id);
+XBT_PUBLIC(void) routing_set_routes(void);
 
 /*
  * Resource protected methods

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 76b9585..aef6d31 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1059,7 +1059,7 @@ static void routing_model_none_create(size_t size_of_link,void *loopback) {
  * FIXME : better to add to the routing model instead !!
  *
  */
-void routing_set_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action)
+void routing_add_route(char *source_id,char *destination_id,xbt_dynar_t links_id,int action)
 {
     char * link_id;
     char * name;
@@ -1078,6 +1078,7 @@ void routing_set_route(char *source_id,char *destination_id,xbt_dynar_t links_id
           manage_route(route_table, name, route_action, 0);
           free(name);
        }
+
 }
 
 void routing_add_host(char* host_id)
@@ -1090,3 +1091,8 @@ void routing_add_host(char* host_id)
          TRACE_surf_host_define_id (host_id, *val);
        #endif
 }
+
+void routing_set_routes()
+{
+       routing_full_parse_end();
+}