l->modified = 0;
l->selective_update_active = sg_maxmin_selective_update;
- DEBUG1("Setting selective_update_active flag to %d\n",
+ XBT_DEBUG("Setting selective_update_active flag to %d\n",
l->selective_update_active);
xbt_swag_init(&(l->variable_set),
lmm_constraint_t cnst = NULL;
while ((var = extract_variable(sys))) {
- WARN2
+ XBT_WARN
("Variable %p (%d) still in LMM system when freing it: this may be a bug",
var, var->id_int);
lmm_var_free(sys, var);
int i;
lmm_element_t elem = NULL;
- XBT_IN2("(sys=%p, var=%p)", sys, var);
+ XBT_IN("(sys=%p, var=%p)", sys, var);
sys->modified = 1;
for (i = 0; i < var->cnsts_number; i++) {
lmm_update_modified_set(sys, elem->constraint);
}
var->cnsts_number = 0;
- XBT_OUT;
+ XBT_OUT();
}
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
{
lmm_variable_disable(sys, var);
- free(var->cnsts);
xbt_mallocator_release(sys->variable_mallocator, var);
}
static void *lmm_variable_mallocator_new_f(void)
{
- return xbt_new(s_lmm_variable_t, 1);
+ lmm_variable_t var = xbt_new(s_lmm_variable_t, 1);
+ var->cnsts = NULL; /* will be created by realloc */
+ return var;
}
static void lmm_variable_mallocator_free_f(void *var)
{
+ xbt_free(((lmm_variable_t) var)->cnsts);
xbt_free(var);
}
static void lmm_variable_mallocator_reset_f(void *var)
{
- /* memset to zero like calloc */
- memset(var, 0, sizeof(s_lmm_variable_t));
+ /* lmm_variable_new() initializes everything */
}
lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
lmm_variable_t var = NULL;
int i;
- XBT_IN5("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)",
+ XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)",
sys, id, weight, bound, number_of_constraints);
var = xbt_mallocator_get(sys->variable_mallocator);
var->id = id;
var->id_int = Global_debug_id++;
- var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
+ var->cnsts = xbt_realloc(var->cnsts, number_of_constraints * sizeof(s_lmm_element_t));
for (i = 0; i < number_of_constraints; i++) {
- /* Should be useless because of the
- calloc but it seems to help valgrind... */
var->cnsts[i].element_set_hookup.next = NULL;
var->cnsts[i].element_set_hookup.prev = NULL;
var->cnsts[i].active_element_set_hookup.next = NULL;
var->cnsts[i].value = 0.0;
}
var->cnsts_size = number_of_constraints;
- var->cnsts_number = 0; /* Should be useless because of the
- calloc but it seems to help valgrind... */
+ var->cnsts_number = 0;
var->weight = weight;
var->bound = bound;
var->value = 0.0;
-
+ var->mu = 0.0;
+ var->new_mu = 0.0;
var->func_f = func_f_def;
var->func_fp = func_fp_def;
var->func_fpi = func_fpi_def;
+ var->variable_set_hookup.next = NULL;
+ var->variable_set_hookup.prev = NULL;
+ var->saturated_variable_set_hookup.next = NULL;
+ var->saturated_variable_set_hookup.prev = NULL;
+
if (weight)
xbt_swag_insert_at_head(var, &(sys->variable_set));
else
xbt_swag_insert_at_tail(var, &(sys->variable_set));
- XBT_OUT;
+ XBT_OUT();
return var;
}
{
lmm_constraint_t useless_cnst = NULL;
- XBT_IN3("sys=%p, cnst=%p, min_usage=%f", sys, cnst, *min_usage);
+ XBT_IN("sys=%p, cnst=%p, min_usage=%f", sys, cnst, *min_usage);
if (cnst->usage <= 0) {
- XBT_OUT;
+ XBT_OUT();
return;
}
if (cnst->remaining <= 0) {
- XBT_OUT;
+ XBT_OUT();
return;
}
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
- LOG3(xbt_log_priority_trace,
+ XBT_LOG(xbt_log_priority_trace,
"min_usage=%f (cnst->remaining=%f, cnst->usage=%f)", *min_usage,
cnst->remaining, cnst->usage);
while ((useless_cnst =
} else if (*min_usage == cnst->remaining / cnst->usage) {
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
}
- XBT_OUT;
+ XBT_OUT();
}
static XBT_INLINE void saturated_variable_set_update(lmm_system_t sys)
xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
fprintf(stderr, "%s", trace_buf);
- //DEBUG1("%20s", trace_buf); FIXME
+ //XBT_DEBUG("%20s", trace_buf); FIXME
trace_buf[0] = '\000';
- DEBUG0("Constraints");
+ XBT_DEBUG("Constraints");
/* Printing Constraints */
cnst_list = &(sys->active_constraint_set);
xbt_swag_foreach(cnst, cnst_list) {
strlen(trace_buf) + strlen(print_buf) + 1);
strcat(trace_buf, print_buf);
}
- // DEBUG1("%s", trace_buf);
+ // XBT_DEBUG("%s", trace_buf);
fprintf(stderr, "%s\n", trace_buf);
trace_buf[0] = '\000';
xbt_assert3(!double_positive(sum - cnst->bound),
sum, cnst->bound, sum - cnst->bound);
}
- DEBUG0("Variables");
+ XBT_DEBUG("Variables");
/* Printing Result */
xbt_swag_foreach(var, var_list) {
if (var->bound > 0) {
- DEBUG4("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value,
+ XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value,
var->bound);
xbt_assert2(!double_positive(var->value - var->bound),
"Incorrect value (%f is not smaller than %f",
var->value, var->bound);
} else {
- DEBUG3("'%d'(%f) : %f", var->id_int, var->weight, var->value);
+ XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->weight, var->value);
}
}
if (!(sys->modified))
return;
- XBT_IN1("(sys=%p)", sys);
+ XBT_IN("(sys=%p)", sys);
/*
* Compute Usage and store the variables that reach the maximum.
selective_update_active ? &(sys->modified_constraint_set) :
&(sys->active_constraint_set);
- DEBUG1("Active constraints : %d", xbt_swag_size(cnst_list));
+ XBT_DEBUG("Active constraints : %d", xbt_swag_size(cnst_list));
/* Init: Only modified code portions */
xbt_swag_foreach(cnst, cnst_list) {
elem_list = &(cnst->element_set);
- //DEBUG1("Variable set : %d", xbt_swag_size(elem_list));
+ //XBT_DEBUG("Variable set : %d", xbt_swag_size(elem_list));
xbt_swag_foreach(elem, elem_list) {
var = elem->variable;
if (var->weight <= 0.0)
}
}
}
- DEBUG2("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
+ XBT_DEBUG("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
/* Saturated constraints update */
saturated_constraint_set_update(sys, cnst, &min_usage);
}
DIE_IMPOSSIBLE;
/* First check if some of these variables have reach their upper
bound and update min_usage accordingly. */
- DEBUG5
+ XBT_DEBUG
("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f",
var->id_int, var->bound, var->weight, min_usage,
var->bound * var->weight);
min_bound = var->bound;
else
min_bound = MIN(min_bound, var->bound);
- DEBUG1("Updated min_bound=%f", min_bound);
+ XBT_DEBUG("Updated min_bound=%f", min_bound);
}
}
continue;
}
}
- DEBUG5("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ",
+ XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ",
min_usage, var->id_int, var->weight, var->id_int, var->value);
if ((elem->value > 0)) {
cnst->usage =
MAX(cnst->usage, elem->value / elem->variable->weight);
- DEBUG2("Constraint Usage %d : %f", cnst->id_int,
+ XBT_DEBUG("Constraint Usage %d : %f", cnst->id_int,
cnst->usage);
make_elem_active(elem);
}
if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
lmm_print(sys);
}
- XBT_OUT;
+ XBT_OUT();
}
/* Not a O(1) function */
if (weight == var->weight)
return;
- XBT_IN3("(sys=%p, var=%p, weight=%f)", sys, var, weight);
+ XBT_IN("(sys=%p, var=%p, weight=%f)", sys, var, weight);
sys->modified = 1;
var->weight = weight;
xbt_swag_remove(var, &(sys->variable_set));
if (!weight)
var->value = 0.0;
- XBT_OUT;
+ XBT_OUT();
}
XBT_INLINE double lmm_get_variable_weight(lmm_variable_t var)
if (!sys->selective_update_active)
return;
- //DEBUG1("Updating modified constraint set with constraint %d", cnst->id_int);
+ //XBT_DEBUG("Updating modified constraint set with constraint %d", cnst->id_int);
if (xbt_swag_belongs(cnst, &(sys->modified_constraint_set)))
return;
- //DEBUG1("Inserting into modified constraint set %d", cnst->id_int);
+ //XBT_DEBUG("Inserting into modified constraint set %d", cnst->id_int);
/* add to modified set */
xbt_swag_insert(cnst, &(sys->modified_constraint_set));
var = elem->variable;
for (i = 0; i < var->cnsts_number; i++)
if (cnst != var->cnsts[i].constraint) {
- //DEBUG2("Updating modified %d calling for %d", cnst->id_int, var->cnsts[i].constraint->id_int);
+ //XBT_DEBUG("Updating modified %d calling for %d", cnst->id_int, var->cnsts[i].constraint->id_int);
lmm_update_modified_set(sys, var->cnsts[i].constraint);
}
}
