sanitize type naming between surf models and routing models

[simgrid.git] / src / surf / surf_routing_none.c

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index 8d008d7..ca02726 100644 (file)
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -9,15 +9,11 @@
 /* Global vars */
 extern routing_global_t global_routing;
 extern routing_component_t current_routing;
 /* Global vars */
 extern routing_global_t global_routing;
 extern routing_component_t current_routing;

-extern model_type_t current_routing_model;
+extern routing_model_description_t current_routing_model;

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
 /* Routing model structure */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
 /* Routing model structure */

-typedef struct {
-  s_routing_component_t generic_routing;
-} s_routing_component_none_t, *routing_component_none_t;
-

 /* Business methods */
 static xbt_dynar_t none_get_onelink_routes(routing_component_t rc)
 {
 /* Business methods */
 static xbt_dynar_t none_get_onelink_routes(routing_component_t rc)
 {


@@ -42,12 +38,12 @@ static void none_finalize(routing_component_t rc)
   xbt_free(rc);
 }
 
   xbt_free(rc);
 }
 

-static void none_set_processing_unit(routing_component_t rc,
+static void none_parse_PU(routing_component_t rc,

                                      const char *name)
 {
 }
 
                                      const char *name)
 {
 }
 

-static void none_set_autonomous_system(routing_component_t rc,
+static void none_parse_AS(routing_component_t rc,

                                        const char *name)
 {
 }
                                        const char *name)
 {
 }


@@ -55,20 +51,16 @@ static void none_set_autonomous_system(routing_component_t rc,
 /* Creation routing model functions */
 routing_component_t model_none_create(void)
 {
 /* Creation routing model functions */
 routing_component_t model_none_create(void)
 {

-  routing_component_none_t new_component =
-      xbt_new0(s_routing_component_none_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      none_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      none_set_autonomous_system;
-  new_component->generic_routing.set_route = NULL;
-  new_component->generic_routing.set_ASroute = NULL;
-  new_component->generic_routing.set_bypassroute = NULL;
-  new_component->generic_routing.get_route = none_get_route;
-  new_component->generic_routing.get_onelink_routes =
-      none_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route = none_get_bypass_route;
-  new_component->generic_routing.finalize = none_finalize;
-  return (routing_component_t) new_component;
+  routing_component_t new_component = xbt_new(s_routing_component_t, 1);
+  new_component->parse_PU = none_parse_PU;
+  new_component->parse_AS = none_parse_AS;
+  new_component->parse_route = NULL;
+  new_component->parse_ASroute = NULL;
+  new_component->parse_bypassroute = NULL;
+  new_component->get_route = none_get_route;
+  new_component->get_onelink_routes = none_get_onelink_routes;
+  new_component->get_bypass_route = none_get_bypass_route;
+  new_component->finalize = none_finalize;
+  return new_component;

 }
 
 }