X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/412f2a1c298a4fa51275e0d68f02ee787568432b..ba4c17319eb812cee7e2e9b3de8c60580d37e616:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index ee52f232ac..743bd013cf 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004-2011. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,15 +10,23 @@
 #include "xbt/mallocator.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
+#include <stdio.h>              /* sprintf */
 #include <math.h>
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf,
-				"Logging specific to SURF (maxmin)");
+                                "Logging specific to SURF (maxmin)");
+
+double sg_maxmin_precision = 0.00001;
 
-static void* lmm_variable_mallocator_new_f(void);
+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);
+#define lmm_variable_mallocator_reset_f ((void_f_pvoid_t)NULL)
+static void lmm_update_modified_set(lmm_system_t sys,
+                                    lmm_constraint_t cnst);
+static void lmm_remove_all_modified_set(lmm_system_t sys);
+static int Global_debug_id = 1;
+static int Global_const_debug_id = 1;
 
-lmm_system_t lmm_system_new(void)
+lmm_system_t lmm_system_new(int selective_update)
 {
   lmm_system_t l = NULL;
   s_lmm_variable_t var;
@@ -28,23 +35,31 @@ lmm_system_t lmm_system_new(void)
   l = xbt_new0(s_lmm_system_t, 1);
 
   l->modified = 0;
+  l->selective_update_active = selective_update;
+  l->visited_counter = 1;
+
+  XBT_DEBUG("Setting selective_update_active flag to %d\n",
+         l->selective_update_active);
+
   xbt_swag_init(&(l->variable_set),
-		xbt_swag_offset(var, variable_set_hookup));
+                xbt_swag_offset(var, variable_set_hookup));
   xbt_swag_init(&(l->constraint_set),
-		xbt_swag_offset(cnst, constraint_set_hookup));
+                xbt_swag_offset(cnst, constraint_set_hookup));
 
   xbt_swag_init(&(l->active_constraint_set),
-		xbt_swag_offset(cnst, active_constraint_set_hookup));
+                xbt_swag_offset(cnst, active_constraint_set_hookup));
 
+  xbt_swag_init(&(l->modified_constraint_set),
+                xbt_swag_offset(cnst, modified_constraint_set_hookup));
   xbt_swag_init(&(l->saturated_variable_set),
-		xbt_swag_offset(var, saturated_variable_set_hookup));
+                xbt_swag_offset(var, saturated_variable_set_hookup));
   xbt_swag_init(&(l->saturated_constraint_set),
-		xbt_swag_offset(cnst, saturated_constraint_set_hookup));
+                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);
+  l->variable_mallocator = xbt_mallocator_new(65536,
+                                              lmm_variable_mallocator_new_f,
+                                              lmm_variable_mallocator_free_f,
+                                              lmm_variable_mallocator_reset_f);
 
   return l;
 }
@@ -54,8 +69,12 @@ void lmm_system_free(lmm_system_t sys)
   lmm_variable_t var = NULL;
   lmm_constraint_t cnst = NULL;
 
-  while ((var = extract_variable(sys)))
+  while ((var = extract_variable(sys))) {
+    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);
+  }
 
   while ((cnst = extract_constraint(sys)))
     lmm_cnst_free(sys, cnst);
@@ -64,53 +83,67 @@ void lmm_system_free(lmm_system_t sys)
   free(sys);
 }
 
-void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
+XBT_INLINE void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
 {
   int i;
+  int n;
+
   lmm_element_t elem = NULL;
 
-  XBT_IN2("(sys=%p, var=%p)",sys,var);
+  XBT_IN("(sys=%p, var=%p)", sys, var);
   sys->modified = 1;
 
+  n = 0;
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
     xbt_swag_remove(elem, &(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);
+    else {
+      if (n < i)
+        var->cnsts[n].constraint = elem->constraint;
+      n++;
+    }
+  }
+  if (n) {
+    var->cnsts_number = n;
+    lmm_update_modified_set(sys, var->cnsts[0].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_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
+static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
+                                     lmm_constraint_t cnst)
 {
-/*   xbt_assert0(xbt_swag_size(&(cnst->element_set)), */
+/*   xbt_assert(xbt_swag_size(&(cnst->element_set)), */
 /* 	      "This list should be empty!"); */
-  remove_active_constraint(sys, cnst);
+  make_constraint_inactive(sys, cnst);
   free(cnst);
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
-				    double bound_value)
+                                    double bound_value)
 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;
 
   cnst = xbt_new0(s_lmm_constraint_t, 1);
   cnst->id = id;
+  cnst->id_int = Global_const_debug_id++;
   xbt_swag_init(&(cnst->element_set),
-		xbt_swag_offset(elem, element_set_hookup));
+                xbt_swag_offset(elem, element_set_hookup));
   xbt_swag_init(&(cnst->active_element_set),
-		xbt_swag_offset(elem, active_element_set_hookup));
+                xbt_swag_offset(elem, active_element_set_hookup));
 
   cnst->bound = bound_value;
   cnst->usage = 0;
@@ -120,46 +153,51 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   return cnst;
 }
 
-void lmm_constraint_shared(lmm_constraint_t cnst)
+XBT_INLINE void lmm_constraint_shared(lmm_constraint_t cnst)
 {
   cnst->shared = 0;
 }
 
-void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
+XBT_INLINE int lmm_constraint_is_shared(lmm_constraint_t cnst)
+{
+  return (cnst->shared);
+}
+
+XBT_INLINE 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_new_f(void)
+{
+  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) {
+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_t lmm_variable_new(lmm_system_t sys, void *id,
-				double weight,
-				double bound, int number_of_constraints)
+                                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);
+  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->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->id_int = Global_debug_id++;
+  var->cnsts = xbt_realloc(var->cnsts, number_of_constraints * sizeof(s_lmm_element_t));
+  for (i = 0; i < number_of_constraints; i++) {
     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;
@@ -169,18 +207,28 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
     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->df    = 0.0;
-
-  var->func_fpi  = func_fpi_def;
+  var->visited = sys->visited_counter - 1;
+  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));
 
-  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(" returns %p", var);
   return var;
 }
 
@@ -190,20 +238,24 @@ void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
   lmm_var_free(sys, var);
 }
 
-double lmm_variable_getvalue(lmm_variable_t var)
+XBT_INLINE double lmm_variable_getvalue(lmm_variable_t var)
 {
   return (var->value);
 }
 
+XBT_INLINE double lmm_variable_getbound(lmm_variable_t var)
+{
+  return (var->bound);
+}
+
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, double value)
+                lmm_variable_t var, double value)
 {
   lmm_element_t elem = NULL;
 
   sys->modified = 1;
 
-  xbt_assert0(var->cnsts_number < var->cnsts_size,
-	      "Too much constraints");
+  xbt_assert(var->cnsts_number < var->cnsts_size, "Too much constraints");
 
   elem = &(var->cnsts[var->cnsts_number++]);
 
@@ -211,41 +263,60 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
   elem->constraint = cnst;
   elem->variable = var;
 
-  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);
+  if (var->weight)
+    xbt_swag_insert_at_head(elem, &(elem->constraint->element_set));
+  else
+    xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
+  if(!sys->selective_update_active) {
+    make_constraint_active(sys, cnst);
+  } else if(elem->value>0 || var->weight >0) {
+    make_constraint_active(sys, cnst);
+    lmm_update_modified_set(sys, cnst);
+    if (var->cnsts_number > 1)
+      lmm_update_modified_set(sys, var->cnsts[0].constraint);
+  }
 }
 
 void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
-		    lmm_variable_t var, double value)
+                    lmm_variable_t var, double value)
 {
-  int i ; 
+  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);
+  for (i = 0; i < var->cnsts_number; i++)
+    if (var->cnsts[i].constraint == cnst)
+      break;
+
+  if (i < var->cnsts_number) {
+    if (cnst->shared)
+      var->cnsts[i].value += value;
+    else
+      var->cnsts[i].value = MAX(var->cnsts[i].value, value);
+    lmm_update_modified_set(sys, cnst);
+  } 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)
+                        lmm_variable_t var, double value)
 {
-  int i ; 
+  int i;
 
-  for(i=0; i< var->cnsts_number ; i++)
-    if(var->cnsts[i].constraint == cnst) break;
+  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;
+  if (i < var->cnsts_number) {
+    var->cnsts[i].value = value;
     sys->modified = 1;
-  } else DIE_IMPOSSIBLE;
+    lmm_update_modified_set(sys, cnst);
+  } else
+    DIE_IMPOSSIBLE;
 }
 
-lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
-				       lmm_variable_t var, int num)
+XBT_INLINE lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
+                                                  lmm_variable_t var,
+                                                  int num)
 {
   if (num < var->cnsts_number)
     return (var->cnsts[num].constraint);
@@ -253,64 +324,77 @@ lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
     return NULL;
 }
 
-int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
+XBT_INLINE double lmm_get_cnst_weight_from_var(lmm_system_t sys,
+                                                         lmm_variable_t var,
+                                                         int num)
+{
+  if (num < var->cnsts_number)
+    return (var->cnsts[num].value);
+  else
+    return 0.0;
+}
+
+XBT_INLINE int lmm_get_number_of_cnst_from_var(lmm_system_t sys,
+                                               lmm_variable_t var)
 {
   return (var->cnsts_number);
 }
 
 lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
-				     lmm_constraint_t cnst,
-				     lmm_variable_t * var)
+                                     lmm_constraint_t cnst,
+                                     lmm_element_t * elem)
 {
-  if (!(*var))
-    xbt_swag_getFirst(&(cnst->element_set));
+  if (!(*elem))
+    *elem = xbt_swag_getFirst(&(cnst->element_set));
   else
-    *var = xbt_swag_getNext(*var, cnst->element_set.offset);
-  return *var;
+    *elem = xbt_swag_getNext(*elem, cnst->element_set.offset);
+  if (*elem)
+    return (*elem)->variable;
+  else
+    return NULL;
 }
 
-void *lmm_constraint_id(lmm_constraint_t cnst)
+XBT_INLINE void *lmm_constraint_id(lmm_constraint_t cnst)
 {
   return cnst->id;
 }
 
-void *lmm_variable_id(lmm_variable_t var)
+XBT_INLINE void *lmm_variable_id(lmm_variable_t var)
 {
   return var->id;
 }
 
-static void saturated_constraint_set_update(lmm_system_t sys,
-					    lmm_constraint_t cnst,
-					    double *min_usage)
+static XBT_INLINE int saturated_constraint_set_update(lmm_system_t sys,
+                                                      lmm_constraint_t
+                                                      cnst,
+                                                      double *min_usage)
 {
-  lmm_constraint_t useless_cnst = NULL;
+  volatile double usage;
 
-  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;
-    return;
+    XBT_OUT();
+    return 1;
   }
   if (cnst->remaining <= 0) {
-    XBT_OUT;
-    return;
+    XBT_OUT();
+    return 1;
   }
-  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));
-
-    xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
-  } else if (*min_usage == cnst->remaining / cnst->usage) {
-    xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
+  usage = cnst->remaining / cnst->usage;
+  if (*min_usage < 0 || *min_usage > usage) {
+    *min_usage = usage;
+    XBT_HERE(" min_usage=%f (cnst->remaining=%f, cnst->usage=%f)",
+             *min_usage, cnst->remaining, cnst->usage);
+    xbt_swag_reset(&sys->saturated_constraint_set);
+    xbt_swag_insert(cnst, &sys->saturated_constraint_set);
+  } else if (*min_usage == usage) {
+    xbt_swag_insert(cnst, &sys->saturated_constraint_set);
   }
-  XBT_OUT;
+  XBT_OUT();
+  return 0;
 }
 
-static void saturated_variable_set_update(lmm_system_t sys)
+static XBT_INLINE void saturated_variable_set_update(lmm_system_t sys)
 {
   lmm_constraint_t cnst = NULL;
   xbt_swag_t cnst_list = NULL;
@@ -321,16 +405,16 @@ static void saturated_variable_set_update(lmm_system_t sys)
   while ((cnst = xbt_swag_getFirst(cnst_list))) {
     elem_list = &(cnst->active_element_set);
     xbt_swag_foreach(elem, elem_list) {
-      if(elem->variable->weight<=0) break;
+      if (elem->variable->weight <= 0)
+        break;
       if ((elem->value > 0))
-	xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+        xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
     }
     xbt_swag_remove(cnst, cnst_list);
   }
 }
 
 void lmm_print(lmm_system_t sys)
-
 {
   lmm_constraint_t cnst = NULL;
   lmm_element_t elem = NULL;
@@ -339,64 +423,86 @@ void lmm_print(lmm_system_t sys)
   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;
+  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);
+  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);
+    sprintf(print_buf, "'%d'(%f) ", var->id_int, 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);
+  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';
+  XBT_DEBUG("%20s", trace_buf);
+  trace_buf[0] = '\000';
 
+  XBT_DEBUG("Constraints");
   /* Printing Constraints */
   cnst_list = &(sys->active_constraint_set);
   xbt_swag_foreach(cnst, cnst_list) {
-    sum=0.0;
+    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);
+    sprintf(print_buf, "\t");
+    trace_buf =
+        xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
     strcat(trace_buf, print_buf);
+    sprintf(print_buf, "%s(",(cnst->shared)?"":"max");
+    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->value);
-      trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
+      sprintf(print_buf, "%f.'%d'(%f) %s ", elem->value,
+              elem->variable->id_int, elem->variable->value,(cnst->shared)?"+":",");
+      trace_buf =
+          xbt_realloc(trace_buf,
+                      strlen(trace_buf) + strlen(print_buf) + 1);
       strcat(trace_buf, print_buf);
-      sum += elem->value * elem->variable->value;
+      if(cnst->shared) 
+	sum += elem->value * elem->variable->value;
+      else 
+	sum = MAX(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);
+    sprintf(print_buf, "0) <= %f ('%d')", cnst->bound, cnst->id_int);
+    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);
+    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_assert3(!double_positive(sum-cnst->bound), "Incorrect value (%f is not smaller than %f): %g",
-		sum,cnst->bound,sum-cnst->bound);
+    XBT_DEBUG("%s", trace_buf);
+    trace_buf[0] = '\000';
+    xbt_assert(!double_positive(sum - cnst->bound),
+                "Incorrect value (%f is not smaller than %f): %g",
+                sum, cnst->bound, sum - cnst->bound);
   }
 
+  XBT_DEBUG("Variables");
   /* 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_assert2(!double_positive(var->value-var->bound), "Incorrect value (%f is not smaller than %f",
-		  var->value, var->bound);
+    if (var->bound > 0) {
+      XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value,
+             var->bound);
+      xbt_assert(!double_positive(var->value - var->bound),
+                  "Incorrect value (%f is not smaller than %f",
+                  var->value, var->bound);
+    } else {
+      XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->weight, var->value);
     }
-    else 
-      DEBUG3("'%p'(%f) : %f",var,var->weight,var->value);
   }
 
   free(trace_buf);
@@ -406,46 +512,68 @@ void lmm_solve(lmm_system_t sys)
 {
   lmm_variable_t var = NULL;
   lmm_constraint_t cnst = NULL;
+  lmm_constraint_t cnst_next = NULL;
   lmm_element_t elem = NULL;
   xbt_swag_t cnst_list = NULL;
   xbt_swag_t var_list = NULL;
   xbt_swag_t elem_list = NULL;
   double min_usage = -1;
+  double min_bound = -1;
 
   if (!(sys->modified))
     return;
 
-  /* 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;
-  }
+  XBT_IN("(sys=%p)", sys);
 
-  /* 
+  /*
    * 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));
+  cnst_list =
+      sys->
+      selective_update_active ? &(sys->modified_constraint_set) :
+      &(sys->active_constraint_set);
+
+  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);
+    //XBT_DEBUG("Variable set : %d", xbt_swag_size(elem_list));
+    xbt_swag_foreach(elem, elem_list) {
+      var = elem->variable;
+      if (var->weight <= 0.0)
+        break;
+      var->value = 0.0;
+    }
+  }
+
+  xbt_swag_foreach_safe(cnst, cnst_next, cnst_list) {
     /* INIT */
     cnst->remaining = cnst->bound;
+    if (cnst->remaining == 0)
+      continue;
     cnst->usage = 0;
     elem_list = &(cnst->element_set);
-    cnst->usage = 0.0;
     xbt_swag_foreach(elem, elem_list) {
-      if(elem->variable->weight <=0) break;
+      /* 0-weighted elements (ie, sleep actions) are at the end of the swag and we don't want to consider them */
+      if (elem->variable->weight <= 0)
+        break;
       if ((elem->value > 0)) {
-	if(cnst->shared)
-	  cnst->usage += elem->value / elem->variable->weight;
-	else 
-	  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);
+        if (cnst->shared)
+          cnst->usage += elem->value / elem->variable->weight;
+        else if (cnst->usage < elem->value / elem->variable->weight)
+          cnst->usage = elem->value / elem->variable->weight;
+
+        make_elem_active(elem);
+        if (sys->keep_track)
+          xbt_swag_insert(elem->variable->id, sys->keep_track);
       }
     }
+    XBT_DEBUG("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
     /* Saturated constraints update */
+    if(cnst->usage>0) {
+      xbt_swag_remove(cnst, cnst_list);
+      xbt_swag_insert_at_head(cnst, cnst_list);
+    }
     saturated_constraint_set_update(sys, cnst, &min_usage);
   }
   saturated_variable_set_update(sys);
@@ -457,13 +585,20 @@ void lmm_solve(lmm_system_t sys)
     var_list = &(sys->saturated_variable_set);
 
     xbt_swag_foreach(var, var_list) {
+      if (var->weight <= 0.0)
+        DIE_IMPOSSIBLE;
       /* First check if some of these variables have reach their upper
          bound and update min_usage accordingly. */
-      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);
+      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);
       if ((var->bound > 0) && (var->bound * var->weight < min_usage)) {
-	min_usage = var->bound * var->weight;
-	DEBUG1("Updated min_usage=%f",min_usage);
+        if (min_bound < 0)
+          min_bound = var->bound;
+        else
+          min_bound = MIN(min_bound, var->bound);
+        XBT_DEBUG("Updated min_bound=%f", min_bound);
       }
     }
 
@@ -471,64 +606,88 @@ void lmm_solve(lmm_system_t sys)
     while ((var = xbt_swag_getFirst(var_list))) {
       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);
+      if (min_bound < 0) {
+        var->value = min_usage / var->weight;
+      } else {
+        if (min_bound == var->bound)
+          var->value = var->bound;
+        else {
+          xbt_swag_remove(var, var_list);
+          continue;
+        }
+      }
+      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);
 
 
       /* Update usage */
 
       for (i = 0; i < var->cnsts_number; i++) {
-	elem = &var->cnsts[i];
-	cnst = elem->constraint;
-	if(cnst->shared) {
-	  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);
-	    }
-	  } 
-	}
+        elem = &var->cnsts[i];
+        cnst = elem->constraint;
+        if (cnst->shared) {
+          double_update(&(cnst->remaining), elem->value * var->value);
+          double_update(&(cnst->usage), elem->value / var->weight);
+          if(cnst->usage<=0 || cnst->remaining<=0) {
+            xbt_swag_remove(cnst, cnst_list);
+            xbt_swag_insert_at_tail(cnst, cnst_list);
+          }
+          make_elem_inactive(elem);
+        } else {                /* FIXME one day: We recompute usage.... :( */
+          cnst->usage = 0.0;
+          make_elem_inactive(elem);
+          elem_list = &(cnst->element_set);
+          xbt_swag_foreach(elem, elem_list) {
+            if (elem->variable->weight <= 0)
+              break;
+            if (elem->variable->value > 0)
+              break;
+            if ((elem->value > 0)) {
+              cnst->usage =
+                  MAX(cnst->usage, elem->value / elem->variable->weight);
+              XBT_DEBUG("Constraint Usage %d : %f", cnst->id_int,
+                     cnst->usage);
+              make_elem_active(elem);
+            }
+          }
+        }
       }
       xbt_swag_remove(var, var_list);
     }
 
     /* Find out which variables reach the maximum */
-    cnst_list = &(sys->active_constraint_set);
     min_usage = -1;
+    min_bound = -1;
+
     xbt_swag_foreach(cnst, cnst_list) {
-      saturated_constraint_set_update(sys, cnst, &min_usage);
+      if(saturated_constraint_set_update(sys, cnst, &min_usage)) break;
     }
     saturated_variable_set_update(sys);
 
   } while (xbt_swag_size(&(sys->saturated_variable_set)));
 
   sys->modified = 0;
-  if(XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
+  if (sys->selective_update_active)
+    lmm_remove_all_modified_set(sys);
+
+  if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
     lmm_print(sys);
   }
+  XBT_OUT();
 }
 
 /* Not a O(1) function */
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, double value)
+                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) {
       var->cnsts[i].value = value;
+      sys->modified = 1;
+      lmm_update_modified_set(sys, cnst);
       return;
     }
 }
@@ -546,95 +705,145 @@ void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
  *
  */
 void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
-			       double bound)
+                               double bound)
 {
   sys->modified = 1;
   var->bound = bound;
-}
 
-/** \brief Add the value delta to var->df (the sum of latencies).
- * 
- *  \param sys the lmm_system_t associated
- *  \param var the lmm_variable_t which need to updated
- *  \param delta the variation of the latency
- * 
- *  Add the value delta to var->df (the sum of latencys associated to the
- *  flow). Whenever this function is called a change is  signed in the system. To
- *  avoid false system changing detection it is a good idea to test 
- *  (delta != 0) before calling it.
- *
- */
-void lmm_update_variable_latency(lmm_system_t sys, lmm_variable_t var,
-			       double delta)
-{
-  sys->modified = 1;
-  var->df += delta;
+  if (var->cnsts_number)
+    lmm_update_modified_set(sys, var->cnsts[0].constraint);
 }
 
+
 void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
-				double weight)
+                                double weight)
 {
-  int i ;
+  int i;
   lmm_element_t elem;
 
-  XBT_IN3("(sys=%p, var=%p, weight=%f)",sys,var,weight);
+  if (weight == var->weight)
+    return;
+  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) xbt_swag_insert_at_head(var,&(sys->variable_set));
-  else xbt_swag_insert_at_tail(var,&(sys->variable_set));
+  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));
+    if (weight)
+      xbt_swag_insert_at_head(elem, &(elem->constraint->element_set));
+    else
+      xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
+
+    if (i == 0)
+      lmm_update_modified_set(sys, elem->constraint);
   }
-  XBT_OUT;
+  if (!weight)
+    var->value = 0.0;
+
+  XBT_OUT();
 }
 
-double lmm_get_variable_weight(lmm_variable_t var)
-				  
+XBT_INLINE double lmm_get_variable_weight(lmm_variable_t var)
 {
   return var->weight;
 }
 
-void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
-				 double bound)
+XBT_INLINE void lmm_update_constraint_bound(lmm_system_t sys,
+                                            lmm_constraint_t cnst,
+                                            double bound)
 {
   sys->modified = 1;
+  lmm_update_modified_set(sys, cnst);
   cnst->bound = bound;
 }
 
-int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
+XBT_INLINE int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
 {
   return xbt_swag_belongs(cnst, &(sys->active_constraint_set));
 }
 
-lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys)
+XBT_INLINE lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t
+                                                            sys)
 {
   return xbt_swag_getFirst(&(sys->active_constraint_set));
 }
 
-lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst)
+XBT_INLINE 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);
+  return xbt_swag_getNext(cnst, (sys->active_constraint_set).offset);
 }
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+XBT_INLINE int lmm_is_variable_limited_by_latency(lmm_variable_t var)
+{
+  return (double_equals(var->bound, var->value));
+}
+#endif
 
 
-/** \brief Attribute the value bound to var->bound.
- * 
- *  \param func_f    default function f associated with the chosen protocol flavor
- *  \param func_fp   partial differential of f (f prime, f')
- *  \param func_fpi  inverse of the partial differential of f (f prime inverse, (f')^{-1})
- *  \param func_fpip partial differential of the inverse of the partial differential of f (f prime inverse prime, ((f')^{-1})')
- * 
- *  Set default functions to the ones passed as parameters. This is a polimorfism in C pure, enjoy the roots of programming.
+/** \brief Update the constraint set propagating recursively to
+ *  other constraints so the system should not be entirely computed.
  *
+ *  \param sys the lmm_system_t
+ *  \param cnst the lmm_constraint_t affected by the change
+ *
+ *  A recursive algorithm to optimize the system recalculation selecting only
+ *  constraints that have changed. Each constraint change is propagated
+ *  to the list of constraints for each variable.
  */
-void lmm_set_default_protocol_functions(double (* func_fpi)  (lmm_variable_t var, double x))
+static void lmm_update_modified_set_rec(lmm_system_t sys,
+                                        lmm_constraint_t cnst)
 {
-  func_fpi_def  = func_fpi;
+  lmm_element_t elem;
+
+  xbt_swag_foreach(elem, &cnst->element_set) {
+    lmm_variable_t var = elem->variable;
+    s_lmm_element_t *cnsts = var->cnsts;
+    int i;
+    for (i = 0; var->visited != sys->visited_counter
+             && i < var->cnsts_number ; i++) {
+      if (cnsts[i].constraint != cnst
+          && !xbt_swag_belongs(cnsts[i].constraint,
+                               &sys->modified_constraint_set)) {
+        xbt_swag_insert(cnsts[i].constraint, &sys->modified_constraint_set);
+        lmm_update_modified_set_rec(sys, cnsts[i].constraint);
+      }
+    }
+    var->visited = sys->visited_counter;
+  }
+}
+
+static void lmm_update_modified_set(lmm_system_t sys,
+                                    lmm_constraint_t cnst)
+{
+  /* nothing to do if selective update isn't active */
+  if (sys->selective_update_active
+      && !xbt_swag_belongs(cnst, &sys->modified_constraint_set)) {
+    xbt_swag_insert(cnst, &sys->modified_constraint_set);
+    lmm_update_modified_set_rec(sys, cnst);
+  }
 }
 
+/** \brief Remove all constraints of the modified_constraint_set.
+ *
+ *  \param sys the lmm_system_t
+ */
+static void lmm_remove_all_modified_set(lmm_system_t sys)
+{
+  if (++sys->visited_counter == 1) {
+    /* the counter wrapped around, reset each variable->visited */
+    lmm_variable_t var;
+    xbt_swag_foreach(var, &sys->variable_set)
+      var->visited = 0;
+  }
+  xbt_swag_reset(&sys->modified_constraint_set);
+}