X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..de6dd9c41648c42ed5e8088be046408cc5ddb8c0:/src/surf/maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 6195bbe7f6..2239cd2b3e 100644
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -23,6 +23,11 @@ typedef struct lmm_element {
 #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 {
+  double remaining_over_usage;
+  lmm_constraint_t cnst;
+} s_lmm_constraint_light_t;
+
 typedef struct lmm_constraint {
   /* hookup to system */
   s_xbt_swag_hookup_t constraint_set_hookup;
@@ -30,16 +35,17 @@ typedef struct lmm_constraint {
   s_xbt_swag_hookup_t modified_constraint_set_hookup;
   s_xbt_swag_hookup_t saturated_constraint_set_hookup;
 
-  s_xbt_swag_t element_set;     /* a list of lmm_mat_element_t */
-  s_xbt_swag_t active_element_set;      /* a list of lmm_mat_element_t */
-  double bound;
-  double lambda;
-  double new_lambda;
+  s_xbt_swag_t element_set;     /* a list of lmm_element_t */
+  s_xbt_swag_t active_element_set;      /* a list of lmm_element_t */
   double remaining;
-  int shared;
   double usage;
+  double bound;
+  int shared;
   void *id;
   int id_int;
+  double lambda;
+  double new_lambda;
+  lmm_constraint_light_t cnst_light;
 } s_lmm_constraint_t;
 
 typedef struct lmm_variable {
@@ -55,6 +61,7 @@ typedef struct lmm_variable {
   double value;
   void *id;
   int id_int;
+  unsigned visited;             /* used by lmm_update_modified_set */
   /* \begin{For Lagrange only} */
   double mu;
   double new_mu;
@@ -67,7 +74,7 @@ typedef struct lmm_variable {
 typedef struct lmm_system {
   int modified;
   int selective_update_active;  /* flag to update partially the system only selecting changed portions */
-
+  unsigned visited_counter;     /* used by lmm_update_modified_set */
   s_xbt_swag_t variable_set;    /* a list of lmm_variable_t */
   s_xbt_swag_t constraint_set;  /* a list of lmm_constraint_t */
 
@@ -77,22 +84,22 @@ typedef struct lmm_system {
   s_xbt_swag_t saturated_variable_set;  /* a list of lmm_variable_t */
   s_xbt_swag_t saturated_constraint_set;        /* a list of lmm_constraint_t_t */
 
+  xbt_swag_t keep_track;
+
   xbt_mallocator_t variable_mallocator;
 } s_lmm_system_t;
 
-#define extract_variable(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
-#define extract_constraint(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
+#define extract_variable(sys) xbt_swag_extract(&(sys->variable_set))
+#define extract_constraint(sys) xbt_swag_extract(&(sys->constraint_set))
 #define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set))
 #define remove_variable(sys,var) do {xbt_swag_remove(var,&(sys->variable_set));\
                                  xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0)
 #define remove_constraint(sys,cnst) do {xbt_swag_remove(cnst,&(sys->constraint_set));\
                                         xbt_swag_remove(cnst,&(sys->saturated_constraint_set));} while(0)
-#define remove_active_constraint(sys,cnst) xbt_swag_remove(cnst,&(sys->active_constraint_set))
 #define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set))
-#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
-
-static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
-static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
+#define make_constraint_inactive(sys,cnst) \
+  do { xbt_swag_remove(cnst, &sys->active_constraint_set);              \
+    xbt_swag_remove(cnst, &sys->modified_constraint_set); } while (0)
 
 void lmm_print(lmm_system_t sys);
 
@@ -100,4 +107,4 @@ extern double (*func_f_def) (lmm_variable_t, double);
 extern double (*func_fp_def) (lmm_variable_t, double);
 extern double (*func_fpi_def) (lmm_variable_t, double);
 
-#endif /* _SURF_MAXMIN_PRIVATE_H */
+#endif                          /* _SURF_MAXMIN_PRIVATE_H */