X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/99b517a9c666f4882c8afe1fee51eae6238952c5..bb671f9a46d6bba398acb63681457a3ad5b8c1dc:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 7660fb1377..3e94153e35 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -27,6 +27,7 @@ lmm_system_t lmm_system_new(void)
 
   l = xbt_new0(s_lmm_system_t, 1);
 
+  l->modified = 0;
   xbt_swag_init(&(l->variable_set),
 		xbt_swag_offset(var, variable_set_hookup));
   xbt_swag_init(&(l->constraint_set),
@@ -57,17 +58,27 @@ void lmm_system_free(lmm_system_t sys)
   xbt_free(sys);
 }
 
-static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
+void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
 {
   int i;
   lmm_element_t elem = NULL;
 
+  sys->modified = 1;
+
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
-    xbt_swag_extract(elem, &(elem->constraint->element_set));
+    xbt_swag_remove(elem, &(elem->constraint->element_set));
     if (xbt_swag_size(&(elem->constraint->element_set)))
       make_constraint_inactive(sys, elem->constraint);
   }
+  var->cnsts_number = 0;
+}
+
+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);
 }
@@ -87,7 +98,7 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   s_lmm_element_t elem;
 
   cnst = xbt_new0(s_lmm_constraint_t, 1);
-/*   cnst->id = id; */
+  cnst->id = id;
   xbt_swag_init(&(cnst->element_set),
 		xbt_swag_offset(elem, element_set_hookup));
   xbt_swag_init(&(cnst->active_element_set),
@@ -97,8 +108,6 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   cnst->usage = 0;
   insert_constraint(sys, cnst);
 
-  cnst->id = id;
-
   return cnst;
 }
 
@@ -116,7 +125,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   lmm_variable_t var = NULL;
 
   var = xbt_new0(s_lmm_variable_t, 1);
-/*   var->id = id; */
+  var->id = id;
   var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
   var->cnsts_size = number_of_constraints;
   /* var->cnsts_number = 0; *//* Useless because of the calloc  */
@@ -125,8 +134,6 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   var->value = -1;
   insert_variable(sys, var);
 
-  var->id = id;
-
   return var;
 }
 
@@ -146,6 +153,8 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 {
   lmm_element_t elem = NULL;
 
+  sys->modified = 1;
+
   if (var->cnsts_number >= var->cnsts_size)
     abort();
 
@@ -160,22 +169,43 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
   make_constraint_active(sys, cnst);
 }
 
+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);
+  else return NULL;
+}
+
+int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
+{
+  return(var->cnsts_number);
+}
+
+void *lmm_constraint_id(lmm_constraint_t cnst)
+{
+  return cnst->id;
+}
+
+void *lmm_variable_id(lmm_variable_t var)
+{
+  return var->id;
+}
+
 static void saturated_constraints_update(lmm_system_t sys,
 					 lmm_constraint_t cnst,
 					 xbt_maxmin_float_t * min_usage)
 {
   lmm_constraint_t useless_cnst = NULL;
 
+  sys->modified = 1;
+
   if (cnst->remaining <= 0)
     return;
   if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
-    xbt_swag_t active_elem_list = &(cnst->active_element_set);
-
     *min_usage = cnst->remaining / cnst->usage;
 
-    while (xbt_swag_extract
-	   (useless_cnst, &(sys->saturated_constraint_set))) {
-    }
+    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));
@@ -189,13 +219,15 @@ static void saturated_variables_update(lmm_system_t sys)
   lmm_element_t elem = NULL;
   xbt_swag_t elem_list = NULL;
 
+  sys->modified = 1;
+
   cnst_list = &(sys->saturated_constraint_set);
   while ((cnst = xbt_swag_getFirst(cnst_list))) {
 /*   xbt_swag_foreach(cnst, cnst_list) { */
     elem_list = &(cnst->active_element_set);
     xbt_swag_foreach(elem, elem_list)
 	xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
-    xbt_swag_extract(cnst, cnst_list);
+    xbt_swag_remove(cnst, cnst_list);
   }
 
 }
@@ -210,6 +242,8 @@ void lmm_solve(lmm_system_t sys)
   xbt_swag_t elem_list = NULL;
   xbt_maxmin_float_t min_usage = -1;
 
+  if(!(sys->modified)) return;
+
   /* Init */
   var_list = &(sys->variable_set);
   xbt_swag_foreach(var, var_list) {
@@ -266,7 +300,7 @@ void lmm_solve(lmm_system_t sys)
 	cnst->usage -= elem->value / var->weight;
 	remove_active_elem_in_constraint(elem);
       }
-      xbt_swag_extract(var, var_list);
+      xbt_swag_remove(var, var_list);
     }
 
     /* Find out which variables reach the maximum */
@@ -278,6 +312,8 @@ void lmm_solve(lmm_system_t sys)
     saturated_variables_update(sys);
 
   } while (xbt_swag_size(&(sys->saturated_variable_set)));
+
+  sys->modified = 0;
 }
 
 /* Not a O(1) function */
@@ -288,6 +324,7 @@ void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
   int i;
   lmm_element_t elem = NULL;
 
+  sys->modified = 1;
   for (i = 0; i < var->cnsts_number; i++)
     if (var->cnsts[i].constraint == cnst) {
       elem->value = value;
@@ -295,24 +332,31 @@ void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
     }
 }
 
-void lmm_update_variable_bound(lmm_variable_t var,
+void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
 			       xbt_maxmin_float_t bound)
 {
+  sys->modified = 1;
   var->bound = bound;
 }
 
-void lmm_update_variable_weight(lmm_variable_t var,
+void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
 				xbt_maxmin_float_t weight)
 {
+  sys->modified = 1;
   var->weight = weight;
 }
 
-void lmm_update_constraint_bound(lmm_constraint_t cnst,
+void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
 				 xbt_maxmin_float_t bound)
 {
+  sys->modified = 1;
   cnst->bound = bound;
 }
 
+int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
+{
+  return xbt_swag_belongs(cnst,&(sys->active_constraint_set));
+}
 
 
 /* void lmm_print(lmm_system_t sys) */