X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/251e40dfd575845209e8b4191b87064fb68556a9..3227570daf9d253c6d0a79f3c20c04e50e33146c:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 4d1e379107..65594ab369 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; @@ -32,14 +37,15 @@ typedef struct lmm_constraint { 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 bound; - double lambda; - double new_lambda; double remaining; double usage; + double bound; + int shared; void *id; int id_int; - int shared; + double lambda; + double new_lambda; + lmm_constraint_light_t cnst_light; } s_lmm_constraint_t; typedef struct lmm_variable { @@ -78,6 +84,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;