#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "xbt/mallocator.h"
#include "maxmin_private.h"
#include <stdlib.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
- "Logging specific to the SURF maxmin module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf,
+ "Logging specific to SURF (maxmin)");
+
+static void* lmm_variable_mallocator_new_f(void);
+static void lmm_variable_mallocator_free_f(void *var);
+static void lmm_variable_mallocator_reset_f(void *var);
lmm_system_t lmm_system_new(void)
{
xbt_swag_init(&(l->saturated_constraint_set),
xbt_swag_offset(cnst, saturated_constraint_set_hookup));
+ l->variable_mallocator = xbt_mallocator_new(64,
+ lmm_variable_mallocator_new_f,
+ lmm_variable_mallocator_free_f,
+ lmm_variable_mallocator_reset_f);
+
return l;
}
while ((cnst = extract_constraint(sys)))
lmm_cnst_free(sys, cnst);
+ xbt_mallocator_free(sys->variable_mallocator);
free(sys);
}
{
lmm_variable_disable(sys, var);
- memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
free(var->cnsts);
- free(var);
+ xbt_mallocator_release(sys->variable_mallocator, var);
}
static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
lmm_cnst_free(sys, cnst);
}
+static void* lmm_variable_mallocator_new_f(void) {
+ return xbt_new(s_lmm_variable_t, 1);
+}
+
+static void lmm_variable_mallocator_free_f(void *var) {
+ 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_t lmm_variable_new(lmm_system_t sys, void *id,
double weight,
double bound, int number_of_constraints)
XBT_IN5("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)",
sys,id,weight,bound,number_of_constraints);
- var = xbt_new0(s_lmm_variable_t, 1);
+ var = xbt_mallocator_get(sys->variable_mallocator);
var->id = id;
var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
for(i=0; i<number_of_constraints; i++) {
}
}
-static void lmm_print(lmm_system_t sys)
+void lmm_print(lmm_system_t sys)
{
lmm_constraint_t cnst = NULL;
lmm_element_t elem = NULL;
strcat(trace_buf, print_buf);
xbt_swag_foreach(elem, elem_list) {
sprintf(print_buf,"%f.'%p'(%f) + ",elem->value,
- elem->variable,elem->variable->weight);
+ elem->variable,elem->variable->value);
trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
strcat(trace_buf, print_buf);
sum += elem->value * elem->variable->value;
sprintf(print_buf,"0 <= %f ('%p')",cnst->bound,cnst);
trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
strcat(trace_buf, print_buf);
+
+ if(!cnst->shared) {
+ sprintf(print_buf," [MAX-Constraint]");
+ trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
+ strcat(trace_buf, print_buf);
+ }
DEBUG1("%s",trace_buf);
trace_buf[0]='\000';
- xbt_assert0((sum<=cnst->bound), "Incorrect value");
+ xbt_assert3((sum<=cnst->bound), "Incorrect value (%f is not smaller than %f): %g",
+ sum,cnst->bound,sum-cnst->bound);
}
/* Printing Result */
var->value = 0.0;
}
-
- /* Compute Usage and store the variables that reach the maximum */
-
+ /*
+ * Compute Usage and store the variables that reach the maximum.
+ */
cnst_list = &(sys->active_constraint_set);
DEBUG1("Active constraints : %d", xbt_swag_size(cnst_list));
xbt_swag_foreach(cnst, cnst_list) {
cnst->remaining = cnst->bound;
cnst->usage = 0;
elem_list = &(cnst->element_set);
+ cnst->usage = 0.0;
xbt_swag_foreach(elem, elem_list) {
if(elem->variable->weight <=0) break;
if ((elem->value > 0)) {
if(cnst->shared)
cnst->usage += elem->value / elem->variable->weight;
else
- cnst->usage = 1;
+ if(cnst->usage<elem->value / elem->variable->weight)
+ cnst->usage = elem->value / elem->variable->weight;
+ DEBUG2("Constraint Usage %p : %f",cnst,cnst->usage);
make_elem_active(elem);
}
}
-
/* Saturated constraints update */
saturated_constraint_set_update(sys, cnst, &min_usage);
}
-
saturated_variable_set_update(sys);
/* Saturated variables update */
int i;
var->value = min_usage / var->weight;
+ DEBUG5("Min usage: %f, Var(%p)->weight: %f, Var(%p)->value: %f ",min_usage,var,var->weight,var,var->value);
+
/* Update usage */
elem = &var->cnsts[i];
cnst = elem->constraint;
if(cnst->shared) {
- cnst->remaining -= elem->value * var->value;
- cnst->usage -= elem->value / var->weight;
+ double_update(&(cnst->remaining), elem->value * var->value);
+ double_update(&(cnst->usage), elem->value / var->weight);
+ make_elem_inactive(elem);
+ } else { /* FIXME one day: We recompute usage.... :( */
+ cnst->usage = 0.0;
+ make_elem_inactive(elem);
+ xbt_swag_foreach(elem, elem_list) {
+ if(elem->variable->weight <=0) break;
+ if(elem->variable->value > 0) break;
+ if ((elem->value > 0)) {
+ if(cnst->usage<elem->value / elem->variable->weight)
+ cnst->usage = elem->value / elem->variable->weight;
+ DEBUG2("Constraint Usage %p : %f",cnst,cnst->usage);
+ make_elem_active(elem);
+ }
+ }
}
- make_elem_inactive(elem);
}
xbt_swag_remove(var, var_list);
}
} while (xbt_swag_size(&(sys->saturated_variable_set)));
sys->modified = 0;
- if(XBT_LOG_ISENABLED(maxmin, xbt_log_priority_debug)) {
+ if(XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
lmm_print(sys);
}
}