what is that pimple, for god's sake??

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index c935e72..bc442cb 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -101,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;
 
@@ -115,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;
@@ -138,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 */
@@ -195,14 +188,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);