X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed1436de46a7989e6ca45b6053ea1205b6715151..d435bdefd34324ed0b0c25d1b6eb6dd3b7344524:/src/surf/surf_routing_private.h

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 7e7405a747..c12b6e3329 100644
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -1,9 +1,8 @@
-/*
- * surf_routing_private.h
- *
- *  Created on: 14 avr. 2011
- *      Author: navarrop
- */
+/* Copyright (c) 2009, 2010, 2011. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef _SURF_SURF_ROUTING_PRIVATE_H
 #define _SURF_SURF_ROUTING_PRIVATE_H
@@ -19,17 +18,21 @@
 #include "xbt/set.h"
 #include "surf/surfxml_parse.h"
 
+/* ************************************************************************** */
+/* ******************************* NO ROUTING ******************************* */
+/* Only save the AS tree, and forward calls to child ASes */
+AS_t model_none_create(void);
+AS_t model_none_create_sized(size_t childsize);
+void model_none_finalize(AS_t as);
 /* ************************************************************************** */
 /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
-AS_t routmod_generic_create(size_t childsize);
+AS_t model_generic_create_sized(size_t childsize);
+void model_generic_finalize(AS_t as);
 
-void generic_parse_PU(AS_t rc,
-                                        const char *name);
-void generic_parse_AS(AS_t rc,
-                                          const char *name);
-void generic_parse_bypassroute(AS_t rc,
-                                    const char *src, const char *dst,
-                                    route_extended_t e_route);
+void generic_parse_PU(AS_t rc, const char *name);
+void generic_parse_AS(AS_t rc, const char *name);
+void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst,
+                               route_extended_t e_route);
 
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
@@ -75,7 +78,9 @@ AS_t model_rulebased_create(void);      /* create structures for rulebased routi
 /* **************  Cluster ROUTING   **************** */
 AS_t model_cluster_create(void);      /* create structures for cluster routing model */
 
+/* Pass info from the cluster parser to the cluster routing */
 void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info);
+void surf_routing_cluster_add_backbone(AS_t as, void* bb);
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
@@ -101,8 +106,5 @@ void model_full_end(AS_t as);       /* finalize the creation of full routing mod
 void model_full_set_route(	/* Set the route and ASroute between src and dst */
 		AS_t rc, const char *src, const char *dst, route_extended_t route);
 
-/* ************************************************************************** */
-/* ******************************* NO ROUTING ******************************* */
-AS_t model_none_create(void);           /* none routing model */
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */