X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a17bc1d7ecf4e2db86a7e6226d7ab6a0b1344908..40616078da72e823931c1fb884949054699ec39d:/src/surf/maxmin.cpp

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index 0ea8e653b5..dc0280b8ba 100644
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -8,6 +8,7 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/strbuff.h"
 #include "xbt/mallocator.h"
 #include "maxmin_private.hpp"
 #include <stdlib.h>
@@ -21,12 +22,13 @@ typedef struct s_dyn_light {
   int size;
 } s_dyn_light_t, *dyn_light_t;
 
-double sg_maxmin_precision = 0.00001;
-double sg_surf_precision   = 0.00001;
+double sg_maxmin_precision = 0.00001; /* Change this with --cfg=maxmin/precision:VALUE */
+double sg_surf_precision   = 0.00001; /* Change this with --cfg=surf/precision:VALUE */
+int sg_concurrency_limit   = -1;      /* Change this with --cfg=maxmin/concurrency-limit:VALUE */
 
-static void *lmm_variable_mallocator_new_f(void);
+static void *lmm_variable_mallocator_new_f();
 static void lmm_variable_mallocator_free_f(void *var);
-#define lmm_variable_mallocator_reset_f ((void_f_pvoid_t)NULL)
+#define lmm_variable_mallocator_reset_f ((void_f_pvoid_t)nullptr)
 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;
@@ -72,9 +74,9 @@ inline void lmm_increase_concurrency(lmm_element_t elem) {
              "Concurrency limit overflow!");
 }
 
-lmm_system_t lmm_system_new(int selective_update)
+lmm_system_t lmm_system_new(bool selective_update)
 {
-  lmm_system_t l = NULL;
+  lmm_system_t l = nullptr;
   s_lmm_variable_t var;
   s_lmm_constraint_t cnst;
 
@@ -100,6 +102,8 @@ lmm_system_t lmm_system_new(int selective_update)
                                               lmm_variable_mallocator_free_f,
                                               lmm_variable_mallocator_reset_f);
 
+  l->solve_fun = &lmm_solve;
+
   return l;
 }
 
@@ -127,7 +131,7 @@ static inline void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var)
   int i;
   int nelements;
 
-  lmm_element_t elem = NULL;
+  lmm_element_t elem = nullptr;
 
   XBT_IN("(sys=%p, var=%p)", sys, var);
   sys->modified = 1;
@@ -181,7 +185,7 @@ static inline void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id, double bound_value)
 {
-  lmm_constraint_t cnst = NULL;
+  lmm_constraint_t cnst = nullptr;
   s_lmm_element_t elem;
 
   cnst = xbt_new0(s_lmm_constraint_t, 1);
@@ -194,8 +198,7 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id, double bound_val
   cnst->bound = bound_value;
   cnst->concurrency_maximum=0;
   cnst->concurrency_current=0;
-  //TODO MARTIN Maybe a configuration item for the default cap concurrency? 
-  cnst->concurrency_limit=100;
+  cnst->concurrency_limit  = sg_concurrency_limit;
   cnst->usage = 0;
   cnst->sharing_policy = 1; /* FIXME: don't hardcode the value */
   insert_constraint(sys, cnst);
@@ -253,10 +256,10 @@ inline 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)
+static void *lmm_variable_mallocator_new_f()
 {
   lmm_variable_t var = xbt_new(s_lmm_variable_t, 1);
-  var->cnsts = NULL; /* will be created by realloc */
+  var->cnsts = nullptr; /* will be created by realloc */
   return var;
 }
 
@@ -268,7 +271,7 @@ static void lmm_variable_mallocator_free_f(void *var)
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, double bound, int number_of_constraints)
 {
-  lmm_variable_t var = NULL;
+  lmm_variable_t var = nullptr;
   int i;
 
   XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", sys, id, weight, bound, number_of_constraints);
@@ -278,14 +281,14 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, doubl
   var->id_int = Global_debug_id++;
   var->cnsts = (s_lmm_element_t *) xbt_realloc(var->cnsts, number_of_constraints * sizeof(s_lmm_element_t));
   for (i = 0; i < number_of_constraints; i++) {
-    var->cnsts[i].enabled_element_set_hookup.next = NULL;
-    var->cnsts[i].enabled_element_set_hookup.prev = NULL;
-    var->cnsts[i].disabled_element_set_hookup.next = NULL;
-    var->cnsts[i].disabled_element_set_hookup.prev = NULL;
-    var->cnsts[i].active_element_set_hookup.next = NULL;
-    var->cnsts[i].active_element_set_hookup.prev = NULL;
-    var->cnsts[i].constraint = NULL;
-    var->cnsts[i].variable = NULL;
+    var->cnsts[i].enabled_element_set_hookup.next = nullptr;
+    var->cnsts[i].enabled_element_set_hookup.prev = nullptr;
+    var->cnsts[i].disabled_element_set_hookup.next = nullptr;
+    var->cnsts[i].disabled_element_set_hookup.prev = nullptr;
+    var->cnsts[i].active_element_set_hookup.next = nullptr;
+    var->cnsts[i].active_element_set_hookup.prev = nullptr;
+    var->cnsts[i].constraint = nullptr;
+    var->cnsts[i].variable = nullptr;
     var->cnsts[i].value = 0.0;
   }
   var->cnsts_size = number_of_constraints;
@@ -302,10 +305,10 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, double weight, doubl
   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;
+  var->variable_set_hookup.next = nullptr;
+  var->variable_set_hookup.prev = nullptr;
+  var->saturated_variable_set_hookup.next = nullptr;
+  var->saturated_variable_set_hookup.prev = nullptr;
 
   if (weight)
     xbt_swag_insert_at_head(var, &(sys->variable_set));
@@ -339,7 +342,7 @@ double lmm_variable_getbound(lmm_variable_t var)
 
 void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
 {
-  lmm_element_t elem = NULL;
+  lmm_element_t elem = nullptr;
   int found = 0;
 
   int i;
@@ -373,8 +376,8 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
     lmm_decrease_concurrency(elem);
 
   xbt_swag_remove(elem, &(elem->constraint->active_element_set));
-  elem->constraint = NULL;
-  elem->variable = NULL;
+  elem->constraint = nullptr;
+  elem->variable = nullptr;
   elem->value = 0;
 
   var->cnsts_number -= 1;
@@ -392,7 +395,7 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value)
 {
-  lmm_element_t elem = NULL;
+  lmm_element_t elem = nullptr;
   double weight;
   int i,current_share;
 
@@ -493,7 +496,7 @@ lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t /*sys*/, lmm_variable_t var,
   if (num < var->cnsts_number)
     return (var->cnsts[num].constraint);
   else
-    return NULL;
+    return nullptr;
 }
 
 double lmm_get_cnst_weight_from_var(lmm_system_t /*sys*/, lmm_variable_t var, int num)
@@ -531,7 +534,7 @@ lmm_variable_t lmm_get_var_from_cnst(lmm_system_t /*sys*/, lmm_constraint_t cnst
   if (*elem)
     return (*elem)->variable;
   else
-    return NULL;
+    return nullptr;
 }
 
 //if we modify the swag between calls, normal version may loop forever
@@ -549,7 +552,7 @@ lmm_variable_t lmm_get_var_from_cnst_safe(lmm_system_t /*sys*/, lmm_constraint_t
     if(*numelem>0){
      (*numelem) --;
     }else
-      return NULL;
+      return nullptr;
   }
   if (*elem){
     //elem is not null, so we carry on
@@ -563,7 +566,7 @@ lmm_variable_t lmm_get_var_from_cnst_safe(lmm_system_t /*sys*/, lmm_constraint_t
     }
     return (*elem)->variable;
   }else
-    return NULL;
+    return nullptr;
 }
 
 void *lmm_constraint_id(lmm_constraint_t cnst)
@@ -601,10 +604,10 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_
                                                  dyn_light_t saturated_constraint_set, lmm_system_t sys)
 {
   /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate (cnst_light_tab)*/ 
-  lmm_constraint_light_t cnst = NULL;
+  lmm_constraint_light_t cnst = nullptr;
   void *_elem;
-  lmm_element_t elem = NULL;
-  xbt_swag_t elem_list = NULL;
+  lmm_element_t elem = nullptr;
+  xbt_swag_t elem_list = nullptr;
   int i;
   for(i = 0; i< saturated_constraint_set->pos; i++){
     cnst = &cnst_light_tab[saturated_constraint_set->data[i]];
@@ -622,32 +625,25 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_
 void lmm_print(lmm_system_t sys)
 {
   void *_cnst, *_elem, *_var;
-  lmm_constraint_t cnst = NULL;
-  lmm_element_t elem = NULL;
-  lmm_variable_t var = NULL;
-  xbt_swag_t cnst_list = NULL;
-  xbt_swag_t var_list = NULL;
-  xbt_swag_t elem_list = NULL;
-  char print_buf[1024];
-  char *trace_buf = (char*) xbt_malloc0(sizeof(char));
+  lmm_constraint_t cnst = nullptr;
+  lmm_element_t elem = nullptr;
+  lmm_variable_t var = nullptr;
+  xbt_swag_t cnst_list = nullptr;
+  xbt_swag_t var_list = nullptr;
+  xbt_swag_t elem_list = nullptr;
+  xbt_strbuff_t buf = xbt_strbuff_new();
   double sum = 0.0;
 
   /* Printing Objective */
   var_list = &(sys->variable_set);
-  sprintf(print_buf, "MAX-MIN ( ");
-  trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-  strcat(trace_buf, print_buf);
+  xbt_strbuff_append(buf, "MAX-MIN ( ");
   xbt_swag_foreach(_var, var_list) {
-  var = (lmm_variable_t)_var;
-    sprintf(print_buf, "'%d'(%f) ", var->id_int, var->weight);
-    trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-    strcat(trace_buf, print_buf);
+    var = (lmm_variable_t)_var;
+    xbt_strbuff_printf(buf, "'%d'(%f) ", var->id_int, var->weight);
   }
-  sprintf(print_buf, ")");
-  trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-  strcat(trace_buf, print_buf);
-  XBT_DEBUG("%20s", trace_buf);
-  trace_buf[0] = '\000';
+  xbt_strbuff_append(buf, ")");
+  XBT_DEBUG("%20s", buf->data);
+  xbt_strbuff_clear(buf);
 
   XBT_DEBUG("Constraints");
   /* Printing Constraints */
@@ -657,18 +653,12 @@ void lmm_print(lmm_system_t sys)
     sum = 0.0;
     //Show  the enabled variables
     elem_list = &(cnst->enabled_element_set);
-    sprintf(print_buf, "\t");
-    trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-    strcat(trace_buf, print_buf);
-    sprintf(print_buf, "%s(",(cnst->sharing_policy)?"":"max");
-    trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-    strcat(trace_buf, print_buf);
+    xbt_strbuff_append(buf, "\t");
+    xbt_strbuff_printf(buf, "%s(", (cnst->sharing_policy)?"":"max");
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
-      sprintf(print_buf, "%f.'%d'(%f) %s ", elem->value,
+      xbt_strbuff_printf(buf, "%f.'%d'(%f) %s ", elem->value,
               elem->variable->id_int, elem->variable->value,(cnst->sharing_policy)?"+":",");
-      trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-      strcat(trace_buf, print_buf);
       if(cnst->sharing_policy)
         sum += elem->value * elem->variable->value;
       else 
@@ -678,29 +668,23 @@ void lmm_print(lmm_system_t sys)
     elem_list = &(cnst->disabled_element_set);
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
-      sprintf(print_buf, "%f.'%d'(%f) %s ", elem->value,
+      xbt_strbuff_printf(buf, "%f.'%d'(%f) %s ", elem->value,
               elem->variable->id_int, elem->variable->value,(cnst->sharing_policy)?"+":",");
-      trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-      strcat(trace_buf, print_buf);
       if(cnst->sharing_policy)
         sum += elem->value * elem->variable->value;
       else 
         sum = MAX(sum,elem->value * elem->variable->value);
     }
 
-    sprintf(print_buf, "0) <= %f ('%d')", cnst->bound, cnst->id_int);
-    trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-    strcat(trace_buf, print_buf);
+    xbt_strbuff_printf(buf, "0) <= %f ('%d')", cnst->bound, cnst->id_int);
 
     if (!cnst->sharing_policy) {
-      sprintf(print_buf, " [MAX-Constraint]");
-      trace_buf = (char*) xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
-      strcat(trace_buf, print_buf);
+      xbt_strbuff_printf(buf, " [MAX-Constraint]");
     }
-    XBT_DEBUG("%s", trace_buf);
-    trace_buf[0] = '\000';
-       xbt_assert(!double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision),
-               "Incorrect value (%f is not smaller than %f): %g", sum, cnst->bound, sum - cnst->bound);
+    XBT_DEBUG("%s", buf->data);
+    xbt_strbuff_clear(buf);
+    xbt_assert(!double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision),
+        "Incorrect value (%f is not smaller than %f): %g", sum, cnst->bound, sum - cnst->bound);
        //if(double_positive(sum - cnst->bound, cnst->bound*sg_maxmin_precision))
        //XBT_ERROR("Incorrect value (%f is not smaller than %f): %g",sum, cnst->bound, sum - cnst->bound);
   }
@@ -718,18 +702,18 @@ void lmm_print(lmm_system_t sys)
     }
   }
 
-  free(trace_buf);
+  xbt_strbuff_free(buf);
 }
 
 void lmm_solve(lmm_system_t sys)
 {
   void *_var, *_cnst, *_cnst_next, *_elem;
-  lmm_variable_t var = NULL;
-  lmm_constraint_t cnst = NULL;
-  lmm_element_t elem = NULL;
-  xbt_swag_t cnst_list = NULL;
-  xbt_swag_t var_list = NULL;
-  xbt_swag_t elem_list = NULL;
+  lmm_variable_t var = nullptr;
+  lmm_constraint_t cnst = nullptr;
+  lmm_element_t elem = nullptr;
+  xbt_swag_t cnst_list = nullptr;
+  xbt_swag_t var_list = nullptr;
+  xbt_swag_t elem_list = nullptr;
   double min_usage = -1;
   double min_bound = -1;
 
@@ -871,7 +855,7 @@ void lmm_solve(lmm_system_t sys)
               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;
+              cnst->cnst_light = nullptr;
             }
           } else {
             cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage;
@@ -900,7 +884,7 @@ void lmm_solve(lmm_system_t sys)
               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;
+              cnst->cnst_light = nullptr;
             }
           } else {
             cnst->cnst_light->remaining_over_usage = cnst->remaining / cnst->usage;
@@ -1069,23 +1053,20 @@ void lmm_disable_var(lmm_system_t sys, lmm_variable_t var){
  * And then add it to enabled variables
  */
 void lmm_on_disabled_var(lmm_system_t sys, lmm_constraint_t cnstr){
-  lmm_element_t elem;
-  lmm_element_t nextelem;
-  int numelem;
 
   if(cnstr->concurrency_limit<0)
     return;
 
-  numelem=xbt_swag_size(&(cnstr->disabled_element_set));
+  int numelem = xbt_swag_size(&(cnstr->disabled_element_set));
   if(!numelem)
     return;
 
-  elem= (lmm_element_t) xbt_swag_getFirst(&(cnstr->disabled_element_set));
+  lmm_element_t elem = (lmm_element_t)xbt_swag_getFirst(&(cnstr->disabled_element_set));
 
   //Cannot use xbt_swag_foreach, because lmm_enable_var will modify disabled_element_set.. within the loop
-  while(numelem-- && elem ){
+  while (numelem-- && elem) {
 
-    nextelem = (lmm_element_t) xbt_swag_getNext(elem, cnstr->disabled_element_set.offset);      
+    lmm_element_t nextelem = (lmm_element_t)xbt_swag_getNext(elem, cnstr->disabled_element_set.offset);
 
     if (elem->variable->staged_weight>0 ){
       //Found a staged variable
@@ -1114,7 +1095,6 @@ void lmm_on_disabled_var(lmm_system_t sys, lmm_constraint_t cnstr){
  */
 void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double weight)
 {
-  int minslack;
 
   xbt_assert(weight>=0,"Variable weight should not be negative!");
 
@@ -1131,8 +1111,8 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double wei
   //Are we enabling this variable?
   if (enabling_var){
     var->staged_weight = weight;
-    minslack=lmm_cnstrs_min_concurrency_slack(var);
-    if(minslack<var->concurrency_share){      
+    int minslack       = lmm_cnstrs_min_concurrency_slack(var);
+    if (minslack < var->concurrency_share) {
       XBT_DEBUG("Staging var (instead of enabling) because min concurrency slack %i, with weight %f and concurrency"
                 " share %i", minslack, weight, var->concurrency_share);
       return;
@@ -1149,7 +1129,6 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double wei
   lmm_check_concurrency(sys);
 
   XBT_OUT();
-  return;
 }
 
 double lmm_get_variable_weight(lmm_variable_t var)
@@ -1238,25 +1217,28 @@ static void lmm_remove_all_modified_set(lmm_system_t sys)
 }
 
 /**
- *  Returns total resource load
+ *  Returns resource load (in flop per second, or byte per second, or similar)
  *
- * \param cnst the lmm_constraint_t associated to the resource
+ *  If the resource is shared (the default case), the load is sum of
+ *  resource usage made by every variables located on this resource.
  *
- * This is dead code, but we may use it later for debug/trace.
+ * If the resource is not shared (ie in FATPIPE mode), then the the
+ * load is the max (not the sum) of all resource usages located on this resource.
+ * .
+ * \param cnst the lmm_constraint_t associated to the resource
  */
 double lmm_constraint_get_usage(lmm_constraint_t cnst) {
    double usage = 0.0;
    xbt_swag_t elem_list = &(cnst->enabled_element_set);
    void *_elem;
-   lmm_element_t elem = NULL;
 
    xbt_swag_foreach(_elem, elem_list) {
-   elem = (lmm_element_t)_elem;
-     if ((elem->value > 0)) {
+     lmm_element_t elem = (lmm_element_t)_elem;
+     if (elem->value > 0) {
        if (cnst->sharing_policy)
          usage += elem->value * elem->variable->value;
        else if (usage < elem->value * elem->variable->value)
-         usage = elem->value * elem->variable->value;
+         usage = std::max(usage, elem->value * elem->variable->value);
      }
    }
   return usage;