* Cleanup the DTD by renaming:

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f75a7f6..e417d40 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,6 +17,8 @@
 #define NO_MAX_DURATION -1.0
 #define SG_TCP_CTE_GAMMA 20000.0
 
+xbt_dict_t current_property_set;
+
 extern const char *surf_action_state_names[6];
 
 typedef enum {
@@ -30,13 +32,13 @@ typedef enum {
 } e_surf_network_link_sharing_policy_t;
 
 typedef struct surf_model_private {
-  int (*model_used) (void *model_id);
-  /* Share the models to the actions and return in hom much time
+  int (*resource_used) (void *resource_id);
+  /* Share the resources to the actions and return in hom much time
      the next action may terminate */
-  double (*share_models) (double now);
+  double (*share_resources) (double now);
   /* Update the actions' state */
   void (*update_actions_state) (double now, double delta);
-  void (*update_model_state) (void *id, tmgr_trace_event_t event_type,
+  void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
                                 double value);
   void (*finalize) (void);
 } s_surf_model_private_t;
@@ -47,14 +49,12 @@ typedef struct surf_model_private {
 extern int use_sdp_solver;
 extern int use_lagrange_solver;
 
-double generic_maxmin_share_models(xbt_swag_t running_actions,
-                                     size_t offset);
-double generic_maxmin_share_models2(xbt_swag_t running_actions,
+double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve)(lmm_system_t));
 
-/* Generic functions common to all ressources */
+/* Generic functions common to all modelss */
 e_surf_action_state_t surf_action_get_state(surf_action_t action);
 double surf_action_get_start_time(surf_action_t action);
 double surf_action_get_finish_time(surf_action_t action);
@@ -65,11 +65,9 @@ void surf_action_set_data(surf_action_t action,
                          void *data);
 FILE * surf_fopen(const char *name, const char *mode);
 
-extern lmm_system_t maxmin_system;
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other