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 f3ecc2b..c935e72 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,12 +12,14 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/random_mgr.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
+#include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0
 
 /* user-visible parameters */
 extern double sg_tcp_gamma;
+extern double sg_sender_gap;
 extern double sg_latency_factor;
 extern double sg_bandwidth_factor;
 extern double sg_weight_S_parameter;
@@ -49,6 +51,8 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       void (*solve) (lmm_system_t));
 
 /* Generic functions common to all models */
+void surf_action_init(void);
+void surf_action_exit(void);
 e_surf_action_state_t surf_action_state_get(surf_action_t action);      /* cannot declare inline since we use a pointer to it */
 double surf_action_get_start_time(surf_action_t action);        /* cannot declare inline since we use a pointer to it */
 double surf_action_get_finish_time(surf_action_t action);       /* cannot declare inline since we use a pointer to it */
@@ -68,7 +72,7 @@ void surf_config(const char *name, va_list pa);
 void net_action_recycle(surf_action_t action);
 double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-int net_get_link_latency(surf_action_t action);
+int net_get_link_latency_limited(surf_action_t action);
 #endif
 void net_action_set_max_duration(surf_action_t action, double duration);
 /*
@@ -111,6 +115,16 @@ 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;
@@ -129,15 +143,10 @@ 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 */
+  xbt_dict_t bypassRoutes;             /* store bypass routes */
   model_type_t routing;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
@@ -145,6 +154,8 @@ typedef struct s_routing_component {
   xbt_dict_t routing_sons;
    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, 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);
@@ -154,9 +165,9 @@ typedef struct s_routing_component {
   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,
-                     const char *dst, route_t route);
+                     const char *dst, name_route_extended_t route);
   void (*set_ASroute) (routing_component_t rc, const char *src,
-                       const char *dst, route_extended_t route);
+                       const char *dst, name_route_extended_t route);
   void (*set_bypassroute) (routing_component_t rc, const char *src,
                            const char *dst, route_extended_t e_route);
 } s_routing_component_t;
@@ -170,18 +181,23 @@ typedef int *network_element_t;
 
 struct s_routing_global {
   routing_component_t root;
-  xbt_dict_t where_network_elements;    /* char* -> network_element_info_t */
   void *loopback;
   size_t size_of_link;
-   xbt_dynar_t(*get_route) (const char *src, const char *dst);
-   xbt_dynar_t(*get_onelink_routes) (void);
-   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(void) routing_model_create(size_t size_of_link, void *loopback);
+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