Ansi C declaration of the variables (at the beginning of the blocks)

[simgrid.git] / src / surf / fair_bottleneck.c

diff --git a/src/surf/fair_bottleneck.c b/src/surf/fair_bottleneck.c
index 51aef93..e6da6ad 100644 (file)
--- a/src/surf/fair_bottleneck.c
+++ b/src/surf/fair_bottleneck.c
@@ -20,6 +20,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin);
 void bottleneck_solve(lmm_system_t sys)
 {
   lmm_variable_t var = NULL;
+  lmm_variable_t var_to_update = NULL;
   lmm_constraint_t cnst = NULL;
   lmm_constraint_t useless_cnst = NULL;
   s_lmm_constraint_t s_cnst;
@@ -69,7 +70,12 @@ void bottleneck_solve(lmm_system_t sys)
    * Compute Usage and store the variables that reach the maximum.
    */
   while (1) {
+/*     if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) { */
+/*       DEBUG0("Fair bottleneck done"); */
+/*       lmm_print(sys); */
+/*     } */
     DEBUG1("******* Constraints to process: %d *******", xbt_swag_size(cnst_list));
+    min_usage = -1;
     xbt_swag_foreach_safe(cnst, cnst_next, cnst_list) {
       int nb = 0;
       double max_elem = 0.0;
@@ -98,6 +104,7 @@ void bottleneck_solve(lmm_system_t sys)
        xbt_swag_remove(cnst, cnst_list);
        continue;
       }
+
       /* Saturated constraints update */
       if (min_usage < 0 || min_usage > cnst->remaining / cnst->usage) {
        DEBUG3("Update min_usage (%g) with cnst %p -> %g",min_usage, cnst,
@@ -113,14 +120,44 @@ void bottleneck_solve(lmm_system_t sys)
        DEBUG2("Keep   min_usage (%g) with cnst %p",min_usage, cnst);
        xbt_swag_remove(cnst, cnst_list);
        xbt_swag_insert(cnst, &(cnst_to_update));
+      } else {
+       DEBUG1("\tmin_usage: %f. No update",min_usage);
       }
     }
 
     if (!xbt_swag_size(&cnst_to_update))
       break;
 
+    var_list = &(sys->variable_set);
+    var_to_update = NULL;
+    xbt_swag_foreach(var, var_list) {
+      if(!var->value  && var->bound>0 && 
+        var->bound<min_usage) {
+       var_to_update = var;
+       min_usage = var->bound;
+      }
+    }
+    if(var_to_update) {
+      DEBUG2("\tUpdating var %p (%g)",var_to_update,var_to_update->value);
+      var_to_update->value = var_to_update->bound;
+      
+      for (i = 0; i < var_to_update->cnsts_number; i++) {
+       lmm_element_t elm = &var_to_update->cnsts[i];
+       cnst = elm->constraint;
+       DEBUG1("\t\tUpdating cnst %p",cnst);
+       double_update(&(cnst->remaining), elm->value * var_to_update->value);
+       double_update(&(cnst->usage), elm->value / var_to_update->weight);
+       //              make_elem_inactive(elm);
+      }
+      while ((cnst = xbt_swag_extract(&cnst_to_update))) {
+       xbt_swag_insert(cnst, cnst_list);
+      }
+      continue;
+    }
+
     while ((cnst_next = xbt_swag_extract(&cnst_to_update))) {
       int nb = 0;
+      double remaining = cnst_next->remaining;
       elem_list = &(cnst_next->element_set);
       xbt_swag_foreach(elem, elem_list) {
        if (elem->variable->weight <= 0)
@@ -142,7 +179,7 @@ void bottleneck_solve(lmm_system_t sys)
          break;
        if (var->value == 0.0) {
          DEBUG2("\tUpdating var %p (%g)",var,var->value);
-         var->value = var->weight * cnst_next->remaining / (nb * elem->value);
+         var->value = var->weight * remaining / (nb * elem->value);
 
          /* Update usage */