sanitize type naming between surf models and routing models

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index bc442cb..766aa48 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -107,12 +107,8 @@ typedef struct s_model_type {
   const char *name;
   const char *desc;
   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;
+} s_routing_model_description_t, *routing_model_description_t;
 
 typedef struct s_route {
   xbt_dynar_t link_list;
@@ -140,28 +136,31 @@ typedef enum {
 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;
+  routing_model_description_t routing;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
   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);
-   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);
-   route_extended_t(*get_bypass_route) (routing_component_t rc,
-                                        const char *src, const char *dst);
+  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);
+  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;