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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 2ff37935db..c25e118cd5 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -13,6 +13,7 @@
 #include "surf/surfxml_parse_private.h"
 #include "surf/random_mgr.h"
 #include "instr/instr_private.h"
+#include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0
 
@@ -100,13 +101,16 @@ typedef struct s_onelink {
 /**
  * Routing logic
  */
+typedef struct s_routing_component *routing_component_t;
 
 typedef struct s_model_type {
   const char *name;
   const char *desc;
-  void *(*create) ();
-  void (*load) ();
-  void (*unload) ();
+  routing_component_t (*create) ();
+  void (*load) ();     /* Add parsing callbacks for the time of the creation of this AS
+                          FIXME: that feature is unused and could maybe be killed? */
+  void (*unload) ();   /* Remove the callbacks at the end of this AS's creation
+                          FIXME: that feature is unused and could maybe be killed? */
   void (*end) ();
 } s_model_type_t, *model_type_t;
 
@@ -114,21 +118,12 @@ typedef struct s_route {
   xbt_dynar_t link_list;
 } s_route_t, *route_t;
 
-typedef struct s_name_route {
-  xbt_dynar_t link_name_list;
-} s_name_route_t, *name_route_t;
-
 typedef struct s_name_route_extended {
   s_route_t generic_route;
   char *src_gateway;
   char *dst_gateway;
 } s_name_route_extended_t, *name_route_extended_t;
 
-typedef struct s_route_limits {
-  char *src_gateway;
-  char *dst_gateway;
-} s_route_limits_t, *route_limits_t;
-
 typedef struct s_route_extended {
   s_route_t generic_route;
   char *src_gateway;
@@ -137,12 +132,11 @@ typedef struct s_route_extended {
 
 /* This enum used in the routing structure helps knowing in which situation we are. */
 typedef enum {
-  SURF_ROUTING_NULL = 0,   /**< Indefined type                                   */
+  SURF_ROUTING_NULL = 0,   /**< Undefined type                                   */
   SURF_ROUTING_BASE,       /**< Base case: use simple link lists for routing     */
   SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
 } e_surf_routing_hierarchy_t;
 
-typedef struct s_routing_component *routing_component_t;
 typedef struct s_routing_component {
   xbt_dict_t to_index;			/* char* -> network_element_t */
   xbt_dict_t bypassRoutes;		/* store bypass routes */
@@ -161,13 +155,17 @@ typedef struct s_routing_component {
    route_extended_t(*get_bypass_route) (routing_component_t rc,
                                         const char *src, const char *dst);
   void (*finalize) (routing_component_t rc);
-  void (*set_processing_unit) (routing_component_t rc, const char *name);
-  void (*set_autonomous_system) (routing_component_t rc, const char *name);
-  void (*set_route) (routing_component_t rc, const char *src,
+  /* The parser calls the following functions to inform the routing models
+   * that a new element is added to the AS currently built.
+   *
+   * Of course, only the routing model of this AS is informed, not every ones */
+  void (*parse_PU) (routing_component_t rc, const char *name); /* A host or a router, whatever */
+  void (*parse_AS) (routing_component_t rc, const char *name);
+  void (*parse_route) (routing_component_t rc, const char *src,
                      const char *dst, name_route_extended_t route);
-  void (*set_ASroute) (routing_component_t rc, const char *src,
+  void (*parse_ASroute) (routing_component_t rc, const char *src,
                        const char *dst, name_route_extended_t route);
-  void (*set_bypassroute) (routing_component_t rc, const char *src,
+  void (*parse_bypassroute) (routing_component_t rc, const char *src,
                            const char *dst, route_extended_t e_route);
 } s_routing_component_t;
 
@@ -183,6 +181,7 @@ struct s_routing_global {
   void *loopback;
   size_t size_of_link;
   xbt_dynar_t(*get_route) (const char *src, const char *dst);
+  xbt_dynar_t(*get_route_or_null) (const char *src, const char *dst);
   xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
   xbt_dynar_t(*get_onelink_routes) (void);
   double (*get_latency) (const char *src, const char *dst);
@@ -193,14 +192,13 @@ struct s_routing_global {
   xbt_dynar_t last_route;
 };
 
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
-
-XBT_PUBLIC(void) routing_parse_Scluster(void);       /* cluster bypass */
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
+XBT_PUBLIC(void) routing_register_callbacks(void);
 
 /**
  * Resource protected methods
  */
-xbt_dict_t surf_resource_properties(const void *resource);
+static XBT_INLINE xbt_dict_t surf_resource_properties(const void *resource);
 
 XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
 XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);