Use xbt_malloc (and friends) instead of direct malloc()

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

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index b810512..3d49f84 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -8,7 +8,6 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/mallocator.h"
-#include "xbt/dynar.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
 #include <stdio.h>              /* sprintf */
@@ -22,7 +21,7 @@ typedef struct s_dyn_light {
   int size;
 } s_dyn_light_t, *dyn_light_t;
 
-double sg_maxmin_precision = 0.00001;
+XBT_EXPORT_NO_IMPORT(double) sg_maxmin_precision = 0.00001;
 
 static void *lmm_variable_mallocator_new_f(void);
 static void lmm_variable_mallocator_free_f(void *var);
@@ -33,6 +32,10 @@ static void lmm_remove_all_modified_set(lmm_system_t sys);
 static int Global_debug_id = 1;
 static int Global_const_debug_id = 1;
 
+static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
+static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
+                                     lmm_constraint_t cnst);
+
 lmm_system_t lmm_system_new(int selective_update)
 {
   lmm_system_t l = NULL;
@@ -386,7 +389,7 @@ static XBT_INLINE void saturated_constraint_set_update(double usage,
   } else if (*min_usage == usage) {
     if(saturated_constraint_set->pos == saturated_constraint_set->size) { // realloc the size
       saturated_constraint_set->size *= 2;
-      saturated_constraint_set->data = realloc(saturated_constraint_set->data, (saturated_constraint_set->size) * sizeof(int));
+      saturated_constraint_set->data = xbt_realloc(saturated_constraint_set->data, (saturated_constraint_set->size) * sizeof(int));
     }
     saturated_constraint_set->data[saturated_constraint_set->pos] = cnst_light_num;
     saturated_constraint_set->pos++;
@@ -641,29 +644,42 @@ void lmm_solve(lmm_system_t sys)
         if (cnst->shared) {
           double_update(&(cnst->remaining), elem->value * var->value);
           double_update(&(cnst->usage), elem->value / var->weight);
-          cnst->cnst_light->remaining_over_usage = cnst->remaining /  cnst->usage;
           if(cnst->usage<=0 || cnst->remaining<=0) {
-            xbt_swag_remove(cnst, cnst_list);
-            xbt_swag_insert_at_tail(cnst, cnst_list);
+            if (cnst->cnst_light) {
+              int index = (cnst->cnst_light-cnst_light_tab);
+              XBT_DEBUG("index: %d \t cnst_light_num: %d \t || \t cnst: %p \t cnst->cnst_light: %p \t cnst_light_tab: %p ",
+                  index,cnst_light_num, cnst, cnst->cnst_light, cnst_light_tab);
+              cnst_light_tab[index]=cnst_light_tab[cnst_light_num-1];
+              cnst_light_tab[index].cnst->cnst_light = &cnst_light_tab[index];
+              cnst_light_num--;
+              cnst->cnst_light = NULL;
+            }
+          } else {
+            cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage;
           }
           make_elem_inactive(elem);
-        } else {                /* FIXME one day: We recompute usage.... :( */
+        } else {
           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)
+            if (elem->variable->weight <= 0 || elem->variable->value > 0)
               break;
-            if ((elem->value > 0)) {
-              cnst->usage =
-                  MAX(cnst->usage, elem->value / elem->variable->weight);
-              cnst->cnst_light->remaining_over_usage = cnst->remaining /  cnst->usage;
-              XBT_DEBUG("Constraint Usage %d : %f", cnst->id_int,
-                     cnst->usage);
-              make_elem_active(elem);
+            if (elem->value > 0)
+              cnst->usage = MAX(cnst->usage, elem->value / elem->variable->weight);
+          }
+          if (cnst->usage<=0 || cnst->remaining<=0) {
+            if(cnst->cnst_light) {
+              int index = (cnst->cnst_light-cnst_light_tab);
+              XBT_DEBUG("index: %d \t cnst_light_num: %d \t || \t cnst: %p \t cnst->cnst_light: %p \t cnst_light_tab: %p ",
+                  index,cnst_light_num, cnst, cnst->cnst_light, cnst_light_tab);
+              cnst_light_tab[index]=cnst_light_tab[cnst_light_num-1];
+              cnst_light_tab[index].cnst->cnst_light = &cnst_light_tab[index];
+              cnst_light_num--;
+              cnst->cnst_light = NULL;
             }
+          } else {
+            cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage;
           }
         }
       }
@@ -675,19 +691,18 @@ void lmm_solve(lmm_system_t sys)
     min_bound = -1;
     saturated_constraint_set->pos = 0;
     int pos;
-    for(pos=0; pos<cnst_light_num; pos++){
-      if(cnst_light_tab[pos].remaining_over_usage > 0)
-        saturated_constraint_set_update(
+    for(pos=0; pos<cnst_light_num; pos++)
+      saturated_constraint_set_update(
           cnst_light_tab[pos].remaining_over_usage,
           pos,
           saturated_constraint_set,
           &min_usage);
-    }
+
     saturated_variable_set_update(  cnst_light_tab,
                                     saturated_constraint_set,
                                     sys);
 
-  } while (xbt_swag_size(&(sys->saturated_variable_set)));
+  } while (cnst_light_num > 0);
 
   sys->modified = 0;
   if (sys->selective_update_active)