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

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 7b90eb8b8f..d017ca18f5 100644
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -30,9 +30,6 @@ void generic_set_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) ****************** */
 
@@ -64,48 +61,48 @@ void generic_src_dst_check(routing_component_t rc, const char *src,
 
 /* ************************************************************************** */
 /* *************************** FLOYD ROUTING ******************************** */
-void *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 */
+routing_component_t model_floyd_create(void);  /* create structures 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,
         const char *dst, name_route_extended_t route);
 
-
-#ifdef HAVE_PCRE_LIB
 /* ************************************************** */
 /* ************** RULE-BASED ROUTING **************** */
-void *model_rulebased_create(void);      /* create structures for rulebased routing model */
-void model_rulebased_load(void);         /* load parse functions for rulebased routing model */
-void model_rulebased_unload(void);       /* unload parse functions for rulebased routing model */
-void model_rulebased_end(void);          /* finalize the creation of rulebased routing model */
-#endif
+routing_component_t model_rulebased_create(void);      /* create structures for rulebased routing model */
+
+/* ************************************************** */
+/* **************  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);
+
+/* ************************************************** */
+/* **************  Vivaldi ROUTING   **************** */
+routing_component_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
+#define HOST_PEER(peername) bprintf("peer_%s", peername)
+#define ROUTER_PEER(peername) bprintf("router_%s", peername)
+#define LINK_UP_PEER(peername) bprintf("link_%s_up", peername)
+#define LINK_DOWN_PEER(peername) bprintf("link_%s_down", peername)
 
 /* ************************************************************************** */
 /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-void *model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
-void *model_dijkstra_create(void);       /* create structures for dijkstra routing model */
-void *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 */
+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_end(void);      /* finalize the creation of dijkstra routing model */
 void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
                      const char *dst, name_route_extended_t route);
 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */
-void *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 */
+routing_component_t model_full_create(void);   /* create structures 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);
 
 /* ************************************************************************** */
 /* ******************************* NO ROUTING ******************************* */
-void *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 */
+routing_component_t model_none_create(void);           /* none routing model */
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */