#include "xbt/sysdep.h"
-#include "xbt/error.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_free(sys);
+ xbt_mallocator_free(sys->variable_mallocator);
+ free(sys);
}
void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
int i;
lmm_element_t elem = NULL;
+ XBT_IN2("(sys=%p, var=%p)",sys,var);
sys->modified = 1;
for (i = 0; i < var->cnsts_number; i++) {
elem = &var->cnsts[i];
xbt_swag_remove(elem, &(elem->constraint->element_set));
- if (xbt_swag_size(&(elem->constraint->element_set)))
+ xbt_swag_remove(elem, &(elem->constraint->active_element_set));
+ if (!xbt_swag_size(&(elem->constraint->element_set)))
make_constraint_inactive(sys, elem->constraint);
}
var->cnsts_number = 0;
+ XBT_OUT;
}
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
{
lmm_variable_disable(sys, var);
-
- xbt_free(var->cnsts);
- xbt_free(var);
+ memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
+ free(var->cnsts);
+ xbt_mallocator_release(sys->variable_mallocator, var);
}
static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
/* xbt_assert0(xbt_swag_size(&(cnst->element_set)), */
/* "This list should be empty!"); */
remove_active_constraint(sys, cnst);
- xbt_free(cnst);
+ free(cnst);
}
lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
cnst->bound = bound_value;
cnst->usage = 0;
+ cnst->shared = 1;
insert_constraint(sys, cnst);
return cnst;
}
+void lmm_constraint_shared(lmm_constraint_t cnst)
+{
+ cnst->shared = 0;
+}
+
void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
{
remove_constraint(sys, 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)
{
lmm_variable_t var = NULL;
+ int i;
+
+ 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++) {
+ /* 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].active_element_set_hookup.prev = NULL;
+ var->cnsts[i].constraint = NULL;
+ var->cnsts[i].variable = NULL;
+ var->cnsts[i].value = 0.0;
+ }
var->cnsts_size = number_of_constraints;
- /* var->cnsts_number = 0; *//* Useless because of the calloc */
+ var->cnsts_number = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
var->weight = weight;
var->bound = bound;
var->value = 0.0;
- insert_variable(sys, var);
-
+ if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
+ else xbt_swag_insert_at_tail(var,&(sys->variable_set));
+ XBT_OUT;
return var;
}
elem->constraint = cnst;
elem->variable = var;
- insert_elem_in_constraint(elem);
+ if(var->weight) xbt_swag_insert_at_head(elem,&(elem->constraint->element_set));
+ else xbt_swag_insert_at_tail(elem,&(elem->constraint->element_set));
make_constraint_active(sys, cnst);
}
+void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
+ lmm_variable_t var, double value)
+{
+ int i ;
+ sys->modified = 1;
+
+ for(i=0; i< var->cnsts_number ; i++)
+ if(var->cnsts[i].constraint == cnst) break;
+
+ if(i<var->cnsts_number) var->cnsts[i].value +=value;
+ else lmm_expand(sys,cnst,var,value);
+}
+
+void lmm_elem_set_value(lmm_system_t sys, lmm_constraint_t cnst,
+ lmm_variable_t var, double value)
+{
+ int i ;
+
+ for(i=0; i< var->cnsts_number ; i++)
+ if(var->cnsts[i].constraint == cnst) break;
+
+ if(i<var->cnsts_number) {
+ var->cnsts[i].value =value;
+ sys->modified = 1;
+ } else DIE_IMPOSSIBLE;
+}
+
lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
lmm_variable_t var, int num)
{
{
lmm_constraint_t useless_cnst = NULL;
- if (cnst->usage <= 0)
+ XBT_IN3("sys=%p, cnst=%p, min_usage=%f",sys,cnst,*min_usage);
+ if (cnst->usage <= 0) {
+ XBT_OUT;
return;
- if (cnst->remaining <= 0)
+ }
+ if (cnst->remaining <= 0) {
+ XBT_OUT;
return;
+ }
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
-
+ LOG3(xbt_log_priority_trace,
+ "min_usage=%f (cnst->remaining=%f, cnst->usage=%f)",*min_usage,
+ cnst->remaining, cnst->usage);
while ((useless_cnst =
xbt_swag_getFirst(&(sys->saturated_constraint_set))))
xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
} else if (*min_usage == cnst->remaining / cnst->usage) {
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
}
+ XBT_OUT;
}
static void saturated_variable_set_update(lmm_system_t sys)
cnst_list = &(sys->saturated_constraint_set);
while ((cnst = xbt_swag_getFirst(cnst_list))) {
elem_list = &(cnst->active_element_set);
- xbt_swag_foreach(elem, elem_list)
- if ((elem->value > 0) && (elem->variable->weight > 0))
- xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ xbt_swag_foreach(elem, elem_list) {
+ if(elem->variable->weight<=0) break;
+ if ((elem->value > 0))
+ xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ }
xbt_swag_remove(cnst, cnst_list);
}
+}
+
+static void lmm_print(lmm_system_t sys)
+{
+ lmm_constraint_t cnst = NULL;
+ lmm_element_t elem = NULL;
+ lmm_variable_t var = NULL;
+ xbt_swag_t cnst_list = NULL;
+ xbt_swag_t var_list = NULL;
+ xbt_swag_t elem_list = NULL;
+ char print_buf[1024];
+ char *trace_buf=xbt_malloc0(sizeof(char));
+ double sum=0.0;
+
+ /* Printing Objective */
+ var_list = &(sys->variable_set);
+ sprintf(print_buf,"MAX-MIN ( ");
+ trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
+ strcat(trace_buf, print_buf);
+ xbt_swag_foreach(var, var_list) {
+ sprintf(print_buf,"'%p'(%f) ",var,var->weight);
+ trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
+ strcat(trace_buf, print_buf);
+ }
+ sprintf(print_buf,")");
+ 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';
+
+ /* Printing Constraints */
+ cnst_list = &(sys->active_constraint_set);
+ xbt_swag_foreach(cnst, cnst_list) {
+ sum=0.0;
+ elem_list = &(cnst->element_set);
+ sprintf(print_buf,"\t");
+ trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
+ strcat(trace_buf, print_buf);
+ xbt_swag_foreach(elem, elem_list) {
+ sprintf(print_buf,"%f.'%p'(%f) + ",elem->value,
+ elem->variable,elem->variable->weight);
+ 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);
+ DEBUG1("%s",trace_buf);
+ trace_buf[0]='\000';
+ xbt_assert2((sum<=cnst->bound), "Incorrect value (%f is not smaller than %f)",
+ sum,cnst->bound);
+ }
+
+ /* Printing Result */
+ xbt_swag_foreach(var, var_list) {
+ if(var->bound>0) {
+ DEBUG4("'%p'(%f) : %f (<=%f)",var,var->weight,var->value, var->bound);
+ xbt_assert0((var->value<=var->bound), "Incorrect value");
+ }
+ else
+ DEBUG3("'%p'(%f) : %f",var,var->weight,var->value);
+ }
+ free(trace_buf);
}
void lmm_solve(lmm_system_t sys)
/* Init */
var_list = &(sys->variable_set);
+ DEBUG1("Variable set : %d", xbt_swag_size(var_list));
xbt_swag_foreach(var, var_list) {
var->value = 0.0;
}
/* 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) {
/* INIT */
- elem_list = &(cnst->element_set);
cnst->remaining = cnst->bound;
cnst->usage = 0;
+ elem_list = &(cnst->element_set);
xbt_swag_foreach(elem, elem_list) {
- if ((elem->value > 0) && (elem->variable->weight > 0)) {
- cnst->usage += elem->value / elem->variable->weight;
- insert_active_elem_in_constraint(elem);
+ if(elem->variable->weight <=0) break;
+ if ((elem->value > 0)) {
+ if(cnst->shared)
+ cnst->usage += elem->value / elem->variable->weight;
+ else
+ cnst->usage = 1;
+ make_elem_active(elem);
}
}
/* Fix the variables that have to be */
var_list = &(sys->saturated_variable_set);
-
xbt_swag_foreach(var, var_list) {
/* First check if some of these variables have reach their upper
bound and update min_usage accordingly. */
- if ((var->bound > 0) && (var->bound / var->weight < min_usage)) {
- min_usage = var->bound / var->weight;
+ DEBUG5("var=%p, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f",
+ var, var->bound, var->weight, min_usage,var->bound * var->weight);
+ if ((var->bound > 0) && (var->bound * var->weight < min_usage)) {
+ min_usage = var->bound * var->weight;
+ DEBUG1("Updated min_usage=%f",min_usage);
}
}
for (i = 0; i < var->cnsts_number; i++) {
elem = &var->cnsts[i];
cnst = elem->constraint;
- cnst->remaining -= elem->value * var->value;
- cnst->usage -= elem->value / var->weight;
- remove_active_elem_in_constraint(elem);
+ if(cnst->shared) {
+ cnst->remaining -= elem->value * var->value;
+ cnst->usage -= elem->value / var->weight;
+ }
+ 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(surf_maxmin, xbt_log_priority_debug)) {
+ lmm_print(sys);
+ }
}
/* Not a O(1) function */
void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
double weight)
{
+ int i ;
+ lmm_element_t elem;
+
+ XBT_IN3("(sys=%p, var=%p, weight=%f)",sys,var,weight);
sys->modified = 1;
var->weight = weight;
-}
+ xbt_swag_remove(var,&(sys->variable_set));
+ if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
+ else xbt_swag_insert_at_tail(var,&(sys->variable_set));
+ for (i = 0; i < var->cnsts_number; i++) {
+ elem = &var->cnsts[i];
+ xbt_swag_remove(elem, &(elem->constraint->element_set));
+ if(weight) xbt_swag_insert_at_head(elem, &(elem->constraint->element_set));
+ else xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
+ }
+ XBT_OUT;
+}
double lmm_get_variable_weight(lmm_variable_t var)
return xbt_swag_belongs(cnst, &(sys->active_constraint_set));
}
+lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys)
+{
+ return xbt_swag_getFirst(&(sys->active_constraint_set));
+}
-/* void lmm_print(lmm_system_t sys) */
-/* { */
-/* lmm_variable_t var = NULL; */
-/* lmm_constraint_t cnst = NULL; */
-/* lmm_element_t elem = NULL; */
-/* xbt_swag_t cnst_list = NULL; */
-/* xbt_swag_t var_list = NULL; */
-/* xbt_swag_t elem_list = NULL; */
+lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst)
+{
+ return xbt_swag_getNext(cnst,(sys->active_constraint_set).offset);
+}
-/* var_list = &(sys->variable_set); */
-/* xbt_swag_foreach(var, var_list) { */
-/* printf("%s : {\n",var->id); */
-/* printf("\t %s : {\n",var->id); */
-/* } */
-/* } */
