Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill an unused structure + reindent and cosmetics
authorMartin Quinson <martin.quinson@loria.fr>
Thu, 10 Nov 2011 10:02:14 +0000 (11:02 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Thu, 10 Nov 2011 10:02:14 +0000 (11:02 +0100)
src/surf/surf_routing_dijkstra.c
src/surf/surf_routing_none.c

index 82f1924..4d0ed98 100644 (file)
@@ -11,7 +11,7 @@ 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_dijkstra, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 
 typedef struct {
   s_routing_component_t generic_routing;
index 8d008d7..025dec0 100644 (file)
@@ -14,10 +14,6 @@ extern model_type_t current_routing_model;
 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)
 {
@@ -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)
 {
-  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->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;
+  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;
 }