X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d64076cb863913f0443de9e191934756abdae9c..8cc10e99f53995bc7486e4467b4e6ad8d7be3460:/src/surf/surf_routing_private.h

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index a18de1e281..c2445cf642 100644
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -21,18 +21,16 @@
 
 /* ************************************************************************** */
 /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
+routing_component_t routmod_generic_create(size_t childsize);
 
-void generic_set_processing_unit(routing_component_t rc,
+void generic_parse_PU(routing_component_t rc,
                                         const char *name);
-void generic_set_autonomous_system(routing_component_t rc,
+void generic_parse_AS(routing_component_t rc,
                                           const char *name);
-void generic_set_bypassroute(routing_component_t rc,
+void generic_parse_bypassroute(routing_component_t rc,
                                     const char *src, const char *dst,
                                     route_extended_t e_route);
 
-int surf_link_resource_cmp(const void *a, const void *b);
-int surf_pointer_resource_cmp(const void *a, const void *b);
-
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
 
@@ -65,10 +63,8 @@ void generic_src_dst_check(routing_component_t rc, const char *src,
 /* ************************************************************************** */
 /* *************************** FLOYD ROUTING ******************************** */
 routing_component_t model_floyd_create(void);  /* create structures for floyd routing model */
-void model_floyd_load(void);     /* load parse functions for floyd routing model */
-void model_floyd_unload(void);   /* unload parse functions for floyd routing model */
 void model_floyd_end(void);      /* finalize the creation of floyd routing model */
-void model_floyd_set_route(routing_component_t rc, const char *src,
+void model_floyd_parse_route(routing_component_t rc, const char *src,
         const char *dst, name_route_extended_t route);
 
 /* ************************************************** */
@@ -78,7 +74,6 @@ routing_component_t model_rulebased_create(void);      /* create structures for
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
 routing_component_t model_cluster_create(void);      /* create structures for cluster routing model */
-void model_cluster_unload(void);          /* Finalize the routing model */
 
 void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info);
 
@@ -95,17 +90,13 @@ routing_component_t model_vivaldi_create(void);      /* create structures for vi
 routing_component_t model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
 routing_component_t model_dijkstra_create(void);       /* create structures for dijkstra routing model */
 routing_component_t model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
-void model_dijkstra_both_load(void);     /* load parse functions for dijkstra routing model */
-void model_dijkstra_both_unload(void);   /* unload parse functions for dijkstra routing model */
 void model_dijkstra_both_end(void);      /* finalize the creation of dijkstra routing model */
-void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
+void model_dijkstra_both_parse_route (routing_component_t rc, const char *src,
                      const char *dst, name_route_extended_t route);
 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */
 routing_component_t model_full_create(void);   /* create structures for full routing model */
-void model_full_load(void);      /* load parse functions for full routing model */
-void model_full_unload(void);    /* unload parse functions for full routing model */
 void model_full_end(void);       /* finalize the creation of full routing model */
 void model_full_set_route(	/* Set the route and ASroute between src and dst */
 		routing_component_t rc, const char *src, const char *dst, name_route_extended_t route);
@@ -113,8 +104,5 @@ void model_full_set_route(	/* Set the route and ASroute between src and dst */
 /* ************************************************************************** */
 /* ******************************* NO ROUTING ******************************* */
 routing_component_t model_none_create(void);           /* none routing model */
-void model_none_load(void);              /* none routing model */
-void model_none_unload(void);            /* none routing model */
-void model_none_end(void);               /* none routing model */
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */