A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker : use xbt_cfg_setdefault instead of default_value in surf_config (incor...
[simgrid.git]
/
src
/
surf
/
maxmin_private.h
diff --git
a/src/surf/maxmin_private.h
b/src/surf/maxmin_private.h
index a20a7967aa9d246acf34d0d6ef063482fa59e771..2239cd2b3ecffb1245a48b44bbcafb38bf50311d 100644
(file)
--- 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))
#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;
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 */
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 remaining;
double usage;
+ double bound;
+ int shared;
void *id;
int id_int;
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 {
} s_lmm_constraint_t;
typedef struct lmm_variable {
@@
-55,6
+61,7
@@
typedef struct lmm_variable {
double value;
void *id;
int id_int;
double value;
void *id;
int id_int;
+ unsigned visited; /* used by lmm_update_modified_set */
/* \begin{For Lagrange only} */
double mu;
double new_mu;
/* \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 */
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 */
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
+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 */
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;
xbt_mallocator_t variable_mallocator;
} s_lmm_system_t;
@@
-92,10
+101,6
@@
typedef struct lmm_system {
do { xbt_swag_remove(cnst, &sys->active_constraint_set); \
xbt_swag_remove(cnst, &sys->modified_constraint_set); } while (0)
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,
- lmm_constraint_t cnst);
-
void lmm_print(lmm_system_t sys);
extern double (*func_f_def) (lmm_variable_t, double);
void lmm_print(lmm_system_t sys);
extern double (*func_f_def) (lmm_variable_t, double);