X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d2d03cbe8e81c09d13f5c61a28ff65742f924d4..b5ded4c27fcbc0e3487b182cdacdb321ba4ab85d:/src/surf/maxmin.c diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index 2bfa436567..8dd3fb35d3 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -8,10 +8,15 @@ #include "xbt/sysdep.h" #include "xbt/log.h" +#include "xbt/mallocator.h" #include "maxmin_private.h" #include -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) { @@ -35,6 +40,11 @@ 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; } @@ -49,6 +59,7 @@ void lmm_system_free(lmm_system_t sys) while ((cnst = extract_constraint(sys))) lmm_cnst_free(sys, cnst); + xbt_mallocator_free(sys->variable_mallocator); free(sys); } @@ -75,9 +86,8 @@ static void lmm_var_free(lmm_system_t sys, lmm_variable_t var) { 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) @@ -120,6 +130,19 @@ void lmm_constraint_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) @@ -130,7 +153,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, 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; ivalue, - 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; @@ -347,9 +370,16 @@ static void lmm_print(lmm_system_t sys) 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 */ @@ -385,9 +415,9 @@ void lmm_solve(lmm_system_t sys) 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) { @@ -395,21 +425,22 @@ void lmm_solve(lmm_system_t sys) 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->usagevalue / 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 */ @@ -434,6 +465,8 @@ void lmm_solve(lmm_system_t sys) 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 */ @@ -441,10 +474,23 @@ void lmm_solve(lmm_system_t sys) 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->usagevalue / 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); } @@ -460,7 +506,7 @@ void lmm_solve(lmm_system_t sys) } 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); } }