cosmetics: variable&fields renaming

[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 025dec0..a48d9ae 100644 (file)
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -6,61 +6,57 @@
 
 #include "surf_routing_private.h"
 
-/* Global vars */
-extern routing_global_t global_routing;
-extern routing_component_t current_routing;
-extern model_type_t current_routing_model;
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
 /* Routing model structure */
 /* Business methods */
-static xbt_dynar_t none_get_onelink_routes(routing_component_t rc)
+static xbt_dynar_t none_get_onelink_routes(AS_t rc)
 {
   return NULL;
 }
 
-static route_extended_t none_get_route(routing_component_t rc,
+static route_extended_t none_get_route(AS_t rc,
                                        const char *src, const char *dst)
 {
   return NULL;
 }
 
-static route_extended_t none_get_bypass_route(routing_component_t rc,
+static route_extended_t none_get_bypass_route(AS_t rc,
                                               const char *src,
                                               const char *dst)
 {
   return NULL;
 }
 
-static void none_finalize(routing_component_t rc)
-{
-  xbt_free(rc);
+void model_none_finalize(AS_t as) {
+  xbt_free(as);
 }
 
-static void none_set_processing_unit(routing_component_t rc,
+static void none_parse_PU(AS_t rc,
                                      const char *name)
 {
 }
 
-static void none_set_autonomous_system(routing_component_t rc,
+static void none_parse_AS(AS_t rc,
                                        const char *name)
 {
 }
 
 /* Creation routing model functions */
-routing_component_t model_none_create(void)
-{
-  routing_component_t new_component = xbt_new(s_routing_component_t, 1);
-  new_component->set_processing_unit = none_set_processing_unit;
-  new_component->set_autonomous_system = none_set_autonomous_system;
-  new_component->set_route = NULL;
-  new_component->set_ASroute = NULL;
-  new_component->set_bypassroute = NULL;
+AS_t model_none_create() {
+  return model_none_create_sized(sizeof(s_as_t));
+}
+AS_t model_none_create_sized(size_t childsize) {
+  AS_t new_component = xbt_malloc0(childsize);
+  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;
+  new_component->finalize = model_none_finalize;
   return new_component;
 }