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 24d45a2..5448704 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -39,13 +39,6 @@ XBT_PUBLIC(void) surf_action_ref(surf_action_t action);
 XBT_PUBLIC(void *) surf_action_new(size_t size, double cost,
                                    surf_model_t model, int failed);
 
-/**
- * FIXME : still improvaleb [this should be done in the binding code]
- */
-
-XBT_PUBLIC(void) workstation_link_create_resource(char *name,
-        double initial_bandwidth,double initial_latency);
-
 /** \brief Resource model description
  */
      typedef struct surf_model_description {
@@ -135,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
@@ -229,13 +226,22 @@ XBT_PUBLIC_DATA(routing_t) used_routing;
        double (*get_link_latency) (const void *link);                                      /**< Return the current latency of a network link */
        int (*link_shared) (const void *link);
        xbt_dict_t(*get_properties) (const void *resource);
-       void (*link_create_resource) (char *name,double bw_initial,double lat_initial);
-       void (*cpu_create_resource)(char *name, double power_peak,
-                                      double power_scale,
-                                      tmgr_trace_t power_trace,
-                                      e_surf_resource_state_t state_initial,
-                                      tmgr_trace_t state_trace,
-                                      xbt_dict_t cpu_properties);
+       void (*link_create_resource) (char *name,
+                                                                        double bw_initial,
+                                                                        tmgr_trace_t bw_trace,
+                                                                        double lat_initial,
+                                                                        tmgr_trace_t lat_trace,
+                                                                        e_surf_resource_state_t
+                                                                        state_initial,
+                                                                        tmgr_trace_t state_trace,
+                                                                        e_surf_link_sharing_policy_t
+                                                                        policy, xbt_dict_t properties);
+       void (*cpu_create_resource) (char *name, double power_peak,
+                                       double power_scale,
+                                       tmgr_trace_t power_trace,
+                                       e_surf_resource_state_t state_initial,
+                                       tmgr_trace_t state_trace,
+                                       xbt_dict_t cpu_properties);
        void (*add_traces) (void);
 
      } s_surf_model_extension_workstation_t;
@@ -657,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) */
@@ -716,7 +722,15 @@ XBT_PUBLIC(void) surf_link_create_resource(char *name,
 
 
 XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name,
-        double bw_initial,double lat_initial);
+                 double bw_initial,
+                 tmgr_trace_t bw_trace,
+                 double lat_initial,
+                 tmgr_trace_t lat_trace,
+                 e_surf_resource_state_t
+                 state_initial,
+                 tmgr_trace_t state_trace,
+                 e_surf_link_sharing_policy_t
+                 policy, xbt_dict_t properties);
 /**
  * add route element (link_ctn) bypassing the parser
  *