X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/276cb878829b90c459527e9cc5649e662e8e3484..dae127513a4c52efc8494d26ba2c56c802ba147e:/src/surf/maxmin_private.hpp

diff --git a/src/surf/maxmin_private.hpp b/src/surf/maxmin_private.hpp
index c4e3f9cfc0..976caa0308 100644
--- a/src/surf/maxmin_private.hpp
+++ b/src/surf/maxmin_private.hpp
@@ -6,10 +6,10 @@
 #ifndef SURF_MAXMIN_PRIVATE_H
 #define SURF_MAXMIN_PRIVATE_H
 
-#include "surf/maxmin.h"
-#include "xbt/swag.h"
-#include "xbt/mallocator.h"
+#include "surf/maxmin.hpp"
 #include "surf_interface.hpp"
+#include "xbt/mallocator.h"
+#include "xbt/swag.h"
 
 /** @ingroup SURF_lmm
  * @brief LMM element
@@ -17,7 +17,7 @@
  * Basically, each variable will have a set of elements, one for each constraint where it is involved.
  * Then, it is used to list all variables involved in constraint through constraint's xxx_element_set lists, or vice-versa list all constraints for a given variable.
  */
-typedef struct lmm_element {
+struct s_lmm_element_t {
   /* hookup to constraint */
   s_xbt_swag_hookup_t enabled_element_set_hookup;
   s_xbt_swag_hookup_t disabled_element_set_hookup;
@@ -30,14 +30,14 @@ typedef struct lmm_element {
   //   - if CPU, then probably 1.
   //   - If network, then 1 in forward direction and 0.05 backward for the ACKs
   double consumption_weight;
-} s_lmm_element_t;
+};
 #define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
 #define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
 
-typedef struct lmm_constraint_light {
+struct s_lmm_constraint_light_t {
   double remaining_over_usage;
   lmm_constraint_t cnst;
-} s_lmm_constraint_light_t;
+};
 
 /** @ingroup SURF_lmm
  * @brief LMM constraint
@@ -47,7 +47,7 @@ typedef struct lmm_constraint_light {
  * \li Active elements which variable's weight is non-zero (i.e. it is enabled) AND its element value is non-zero. LMM_solve iterates over active elements during resolution, dynamically making them active or unactive.
  *
  */
-typedef struct lmm_constraint {
+struct s_lmm_constraint_t {
   /* hookup to system */
   s_xbt_swag_hookup_t constraint_set_hookup;
   s_xbt_swag_hookup_t active_constraint_set_hookup;
@@ -71,14 +71,14 @@ typedef struct lmm_constraint {
   double lambda;
   double new_lambda;
   lmm_constraint_light_t cnst_light;
-} s_lmm_constraint_t;
+};
 
 /** @ingroup SURF_lmm
  * @brief LMM variable
  *
  * When something prevents us from enabling a variable, we "stage" the weight that we would have like to set, so that as soon as possible we enable the variable with desired weight
  */
-typedef struct lmm_variable {
+struct s_lmm_variable_t {
   /* hookup to system */
   s_xbt_swag_hookup_t variable_set_hookup;
   s_xbt_swag_hookup_t saturated_variable_set_hookup;
@@ -86,11 +86,13 @@ typedef struct lmm_variable {
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
+
   // sharing_weight: variable's impact on the resource during the sharing
   //   if == 0, the variable is not considered by LMM
   //   on CPU, actions with N threads have a sharing of N
   //   on network, the actions with higher latency have a lesser sharing_weight
-  double sharing_weight; /* weight == 0 -> not considered by LMM;  */
+  double sharing_weight;
+
   double staged_weight; /* If non-zero, variable is staged for addition as soon as maxconcurrency constraints will be met */
   double bound;
   double value;
@@ -101,16 +103,16 @@ typedef struct lmm_variable {
   /* \begin{For Lagrange only} */
   double mu;
   double new_mu;
-  double (*func_f) (struct lmm_variable * var, double x);       /* (f)    */
-  double (*func_fp) (struct lmm_variable * var, double x);      /* (f')    */
-  double (*func_fpi) (struct lmm_variable * var, double x);     /* (f')^{-1}    */
+  double (*func_f)(s_lmm_variable_t* var, double x);   /* (f)    */
+  double (*func_fp)(s_lmm_variable_t* var, double x);  /* (f')    */
+  double (*func_fpi)(s_lmm_variable_t* var, double x); /* (f')^{-1}    */
   /* \end{For Lagrange only} */
-} s_lmm_variable_t;
+};
 
 /** @ingroup SURF_lmm
  * @brief LMM system
  */
-typedef struct lmm_system {
+struct s_lmm_system_t {
   int modified;
   bool selective_update_active;  /* flag to update partially the system only selecting changed portions */
   unsigned visited_counter;     /* used by lmm_update_modified_set  and lmm_remove_modified_set to cleverly (un-)flag the constraints (more details in these functions)*/
@@ -128,7 +130,7 @@ typedef struct lmm_system {
   xbt_mallocator_t variable_mallocator;
 
   void (*solve_fun)(lmm_system_t self);
-} s_lmm_system_t;
+};
 
 #define extract_variable(sys) xbt_swag_extract(&(sys->variable_set))
 #define extract_constraint(sys) xbt_swag_extract(&(sys->constraint_set))