sanitize type naming between surf models and routing models

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

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 926b6ad..ca3a73a 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -9,7 +9,7 @@
 /* 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_full, surf, "Routing part of surf");
 
@@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 
 /* Routing model structure */
 
-typedef struct {
+typedef struct s_routing_component_full {
   s_routing_component_t generic_routing;
   route_extended_t *routing_table;
 } s_routing_component_full_t, *routing_component_full_t;
@@ -124,38 +124,19 @@ static void full_finalize(routing_component_t rc)
 
 /* Creation routing model functions */
 
-void *model_full_create(void)
+routing_component_t model_full_create(void)
 {
-  routing_component_full_t new_component =
-      xbt_new0(s_routing_component_full_t, 1);
-  new_component->generic_routing.set_processing_unit =
-      generic_set_processing_unit;
-  new_component->generic_routing.set_autonomous_system =
-      generic_set_autonomous_system;
-  new_component->generic_routing.set_route = model_full_set_route;
-  new_component->generic_routing.set_ASroute = model_full_set_route;
-  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
+  routing_component_full_t new_component = (routing_component_full_t)
+      routmod_generic_create(sizeof(s_routing_component_full_t));
+
+  new_component->generic_routing.parse_route = model_full_set_route;
+  new_component->generic_routing.parse_ASroute = model_full_set_route;
   new_component->generic_routing.get_route = full_get_route;
-  new_component->generic_routing.get_latency = generic_get_link_latency;
   new_component->generic_routing.get_onelink_routes =
       full_get_onelink_routes;
-  new_component->generic_routing.get_bypass_route =
-      generic_get_bypassroute;
   new_component->generic_routing.finalize = full_finalize;
-  new_component->generic_routing.to_index = xbt_dict_new();
-  new_component->generic_routing.bypassRoutes = xbt_dict_new();
-  new_component->generic_routing.get_network_element_type = get_network_element_type;
-  return new_component;
-}
-
-void model_full_load(void)
-{
-  /* use "surfxml_add_callback" to add a parse function call */
-}
 
-void model_full_unload(void)
-{
-  /* use "surfxml_del_callback" to remove a parse function call */
+  return (routing_component_t) new_component;
 }
 
 void model_full_end(void)
@@ -190,6 +171,10 @@ void model_full_end(void)
   }
 }
 
+static int surf_pointer_resource_cmp(const void *a, const void *b) {
+  return a != b;
+}
+
 void model_full_set_route(routing_component_t rc, const char *src,
                const char *dst, name_route_extended_t route)
 {
@@ -199,8 +184,8 @@ void model_full_set_route(routing_component_t rc, const char *src,
        routing_component_full_t routing = ((routing_component_full_t) rc);
        size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
 
-       xbt_assert(src_id
-                         && dst_id, "Network elements %s or %s not found", src, dst);
+       xbt_assert(src_id, "Network elements %s not found", src);
+       xbt_assert(dst_id, "Network elements %s not found", dst);
 
        xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0,
                          "Invalid count of links, must be greater than zero (%s,%s)",