clean code and remove foreach and set

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 402c0b3..5448704 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -128,8 +128,12 @@ XBT_PUBLIC(void) model_help(const char* category, s_surf_model_description_t * t
 /***************************/
 /* Generic model object */
 /***************************/
-     typedef struct s_routing s_routing_t, *routing_t;
-XBT_PUBLIC_DATA(routing_t) used_routing;
+//     typedef struct s_routing s_routing_t, *routing_t; // COMMENT BY DAVID
+//XBT_PUBLIC_DATA(routing_t) used_routing; // COMMENT BY DAVID
+
+     typedef struct s_routing_global s_routing_global_t, *routing_global_t; // ADDED BY DAVID
+XBT_PUBLIC_DATA(routing_global_t) global_routing; // ADDED BY DAVID
+
 
 /** \brief Private data available on all models
  *  \ingroup SURF_models
@@ -659,14 +663,14 @@ XBT_PUBLIC(void) parse_platform_file(const char *file);
 /* Stores the sets */
 XBT_PUBLIC_DATA(xbt_dict_t) set_list;
 
-XBT_PUBLIC_DATA(void) manage_route(xbt_dict_t route_table,
-                                   const char *route_name, int action,
-                                   int isMultiRoute);
-XBT_PUBLIC_DATA(int) route_action;
+// XBT_PUBLIC_DATA(void) manage_route(xbt_dict_t route_table,
+//                                    const char *route_name, int action,
+//                                    int isMultiRoute);
+// XBT_PUBLIC_DATA(int) route_action;
 
 /* This is used by all models when creating the routing table while parsing */
-XBT_PUBLIC_DATA(xbt_dict_t) route_table;
-XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
+// XBT_PUBLIC_DATA(xbt_dict_t) route_table;
+// XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
 
 
 /* For the trace and trace:connect tag (store their content till the end of the parsing) */