sanitize type naming between surf models and routing models

diff --git a/src/surf/surf.c b/src/surf/surf.c
index d5dbc3d..f6d9f20 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -10,8 +10,6 @@
 #include "xbt/module.h"
 #include "mc/mc.h"
 #include "surf/surf_resource.h"
 #include "xbt/module.h"
 #include "mc/mc.h"
 #include "surf/surf_resource.h"

-//#include "surf/surf_resource_lmm.h"
-

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
                                 "Logging specific to SURF (kernel)");

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 58340ea..766aa48 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -108,7 +108,7 @@ typedef struct s_model_type {
   const char *desc;
   routing_component_t (*create) ();
   void (*end) ();
   const char *desc;
   routing_component_t (*create) ();
   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;
 
 typedef struct s_route {
   xbt_dynar_t link_list;


@@ -136,7 +136,7 @@ typedef enum {
 typedef struct s_routing_component {
   xbt_dict_t to_index;                 /* char* -> network_element_t */
   xbt_dict_t bypassRoutes;             /* store bypass routes */
 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;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
   struct s_routing_component *routing_father;

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index f3c2370..f1be3c1 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -38,7 +38,7 @@ static xbt_dict_t random_value = NULL;
 /* Global vars */
 routing_global_t global_routing = NULL;
 routing_component_t current_routing = NULL;
 /* Global vars */
 routing_global_t global_routing = NULL;
 routing_component_t current_routing = NULL;

-model_type_t current_routing_model = NULL;
+routing_model_description_t current_routing_model = NULL;

 
 /* global parse functions */
 xbt_dynar_t link_list = NULL;   /* temporary store of current list link of a route */
 
 /* global parse functions */
 xbt_dynar_t link_list = NULL;   /* temporary store of current list link of a route */


@@ -295,7 +295,7 @@ static void routing_parse_E_bypassRoute(void)
 void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
 {
   routing_component_t new_routing;
 void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
 {
   routing_component_t new_routing;

-  model_type_t model = NULL;
+  routing_model_description_t model = NULL;

   int cpt;
 
   /* search the routing model */
   int cpt;
 
   /* search the routing model */

diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c
index 341012c..9e2fe47 100644 (file)
--- a/src/surf/surf_routing_dijkstra.c
+++ b/src/surf/surf_routing_dijkstra.c
@@ -9,7 +9,7 @@
 /* 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_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
 

diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c
index 081f747..fc8d664 100644 (file)
--- a/src/surf/surf_routing_floyd.c
+++ b/src/surf/surf_routing_floyd.c
@@ -9,7 +9,7 @@
 /* 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_floyd, surf, "Routing part of surf");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 157718e..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;
 /* 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");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index 0341778..ca02726 100644 (file)
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -9,7 +9,7 @@
 /* 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");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 

diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c
index b6c16c4..00a9b88 100644 (file)
--- a/src/surf/surf_routing_rulebased.c
+++ b/src/surf/surf_routing_rulebased.c
@@ -9,7 +9,7 @@
 /* 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;

 extern xbt_dynar_t link_list;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of surf");
 extern xbt_dynar_t link_list;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of surf");