Rewrite the way to do the parsing for host,cluster,peer,router and link.

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 55a9778..c935e72 100644 (file)
--- 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
 
@@ -142,13 +143,6 @@ typedef enum {
   SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
 } e_surf_routing_hierarchy_t;
 
-typedef enum {
-  SURF_NETWORK_ELEMENT_NULL = 0,        /* NULL */
-  SURF_NETWORK_ELEMENT_HOST,    /* host type */
-  SURF_NETWORK_ELEMENT_ROUTER,  /* router type */
-  SURF_NETWORK_ELEMENT_AS,      /* AS type */
-} e_surf_network_element_type_t;
-
 typedef struct s_routing_component *routing_component_t;
 typedef struct s_routing_component {
   xbt_dict_t to_index;                 /* char* -> network_element_t */
@@ -161,7 +155,7 @@ typedef struct s_routing_component {
    route_extended_t(*get_route) (routing_component_t rc, const char *src,
                                  const char *dst);
    double(*get_latency) (routing_component_t rc, const char *src,
-                                 const char *dst);
+                                 const char *dst, route_extended_t e_route);
    xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
    e_surf_network_element_type_t(*get_network_element_type) (const char
                                                              *name);
@@ -189,21 +183,22 @@ struct s_routing_global {
   routing_component_t root;
   void *loopback;
   size_t size_of_link;
-   xbt_dynar_t(*get_route) (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);
-   e_surf_network_element_type_t(*get_network_element_type) (const char
-                                                             *name);
+  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);
+  void (*get_route_latency)(const char *src, const char *dst,
+                            xbt_dynar_t *route, double *latency, int cleanup);
+  e_surf_network_element_type_t(*get_network_element_type) (const char *name);
   void (*finalize) (void);
   xbt_dynar_t last_route;
 };
 
-XBT_PUBLIC(e_surf_network_element_type_t) get_network_element_type(const char
-                                                              *name);
-
 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 */
+
 /**
  * Resource protected methods
  */