X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e409499a7aa4d85a458fabdae9cdb5fb3ac7c302..e64ae6980f1b1f8b51d06f21fb1f5df9586c2333:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 30f1589c72..539b67714a 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -55,6 +55,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 +68,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,6 +78,8 @@ 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; @@ -88,7 +91,9 @@ typedef struct lmm_system { #define remove_constraint(sys,cnst) do {xbt_swag_remove(cnst,&(sys->constraint_set));\ xbt_swag_remove(cnst,&(sys->saturated_constraint_set));} while(0) #define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set)) -#define make_constraint_inactive(sys,cnst) xbt_swag_remove(cnst,&(sys->active_constraint_set)) +#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) static void lmm_var_free(lmm_system_t sys, lmm_variable_t var); static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,