X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d938be0afd2015d43ba18c58d55517410f800d1..b40f1241d74d1a0b69d1d39e4202224426e1e374:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index ce5f31e0f2..8c016bef00 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -64,12 +64,12 @@ void surf_config_init(int *argc, char **argv);
 void surf_config_finalize(void);
 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);
+#endif
 void net_action_set_max_duration(surf_action_t action, double duration);
-
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
@@ -88,20 +88,15 @@ int __surf_is_absolute_file_path(const char *file_path);
  * One link routing list
  */
 typedef struct {
-	int src_id;
-	int dst_id;
+	char *src;
+	char *dst;
 	void *link_ptr;
 }s_onelink, *s_onelink_t;
 
-
-/*
+/**
  * Routing logic
  */
 
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW STRUCTURES
-////////////////////////////////////////////////////////////////////////////////
-
 typedef enum {
   SURF_NETWORK_ELEMENT_NULL = 0,   /* NULL */
   SURF_NETWORK_ELEMENT_HOST,       /* host type */
@@ -163,9 +158,11 @@ struct s_routing_component {
   struct s_routing_component* routing_father;
   xbt_dict_t routing_sons;
   route_extended_t (*get_route)(routing_component_t rc, const char* src, const char* dst);
+  xbt_dict_t (*get_onelink_routes)(void);
+  int (*is_router)(const char *name);
   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_units)(routing_component_t rc, const char* name);
+  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);
   void (*set_ASroute)(routing_component_t rc, const char* src, const char* dst, route_extended_t route);
@@ -178,24 +175,22 @@ struct s_routing_global {
   void *loopback;
   size_t size_of_link;
   xbt_dynar_t (*get_route)(const char* src, const char* dst);
+  xbt_dict_t (*get_onelink_routes)(void);
+  int (*is_router)(const char *name);
   void (*finalize)(void);
   xbt_dynar_t last_route;
 };
 
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
 
-////////////////////////////////////////////////////////////////////////////////
-// HERE END THE NEW STRUCTURES
-////////////////////////////////////////////////////////////////////////////////
-
-/*
+/**
  * Resource protected methods
  */
 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);
-XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 
+XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
 
 #endif /* _SURF_SURF_PRIVATE_H */