Cosmetics.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@496 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/heap.h b/include/xbt/heap.h
index 2f6d792..85b8c4f 100644 (file)
--- a/include/xbt/heap.h
+++ b/include/xbt/heap.h
@@ -13,7 +13,6 @@ typedef struct xbt_heap *xbt_heap_t;
 typedef long double xbt_heap_float_t;
 #define XBT_HEAP_FLOAT_T "%Lg" /* for printing purposes */
 
 typedef long double xbt_heap_float_t;
 #define XBT_HEAP_FLOAT_T "%Lg" /* for printing purposes */
 

-

 /* pointer to a function freeing something (should be common to all .h : FIXME) */
 typedef void (void_f_pvoid_t) (void *);
 
 /* pointer to a function freeing something (should be common to all .h : FIXME) */
 typedef void (void_f_pvoid_t) (void *);
 

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 45fd60b..a834d74 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -24,20 +24,20 @@ typedef struct xbt_swag {
 
 xbt_swag_t xbt_swag_new(size_t offset);
 void xbt_swag_init(xbt_swag_t swag, size_t offset);
 
 xbt_swag_t xbt_swag_new(size_t offset);
 void xbt_swag_init(xbt_swag_t swag, size_t offset);

-void  xbt_swag_insert(void *obj,xbt_swag_t swag);
+void xbt_swag_insert(void *obj, xbt_swag_t swag);

 void *xbt_swag_extract(void *obj, xbt_swag_t swag);
 void *xbt_swag_extract(void *obj, xbt_swag_t swag);

-int  xbt_swag_size(xbt_swag_t swag);
-int  xbt_swag_belongs(void *obj,xbt_swag_t swag);
+int xbt_swag_size(xbt_swag_t swag);
+int xbt_swag_belongs(void *obj, xbt_swag_t swag);

 
 static __inline__ void *xbt_swag_getFirst(xbt_swag_t swag)
 {
 
 static __inline__ void *xbt_swag_getFirst(xbt_swag_t swag)
 {

-  return(swag->head);
+  return (swag->head);

 }
 
 #define xbt_swag_getNext(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev)
 #define xbt_swag_getPrev(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next)
 
 }
 
 #define xbt_swag_getNext(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->prev)
 #define xbt_swag_getPrev(obj,offset) (((xbt_swag_hookup_t)(((char *) (obj)) + (offset)))->next)
 

-#define xbt_swag_offset(var,field) ((char *)&( (var).field ) - (char *)&(var)) 
+#define xbt_swag_offset(var,field) ((char *)&( (var).field ) - (char *)&(var))

 
 #define xbt_swag_foreach(obj,swag)                            \
    for((obj)=xbt_swag_getFirst((swag));                           \
 
 #define xbt_swag_foreach(obj,swag)                            \
    for((obj)=xbt_swag_getFirst((swag));                           \

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index f287a96..eab5957 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -3,7 +3,8 @@
 /* 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. */
 
 /* 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. */
 

-typedef long double FLOAT;
+typedef long double xbt_maxmin_float_t;
+#define XBT_MAXMIN_FLOAT_T "%Lg"       /* for printing purposes */

 
 typedef struct lmm_variable *lmm_variable_t;
 typedef struct lmm_constraint *lmm_constraint_t;
 
 typedef struct lmm_variable *lmm_variable_t;
 typedef struct lmm_constraint *lmm_constraint_t;


@@ -12,24 +13,28 @@ typedef struct lmm_system *lmm_system_t;
 lmm_system_t lmm_system_new(void);
 void lmm_system_free(lmm_system_t sys);
 
 lmm_system_t lmm_system_new(void);
 void lmm_system_free(lmm_system_t sys);
 

-lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id, 
-                                   FLOAT bound_value);
+lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
+                                   xbt_maxmin_float_t bound_value);

 void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
 
 void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
 

-lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, 
-                               FLOAT weight_value, FLOAT bound,
+lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
+                               xbt_maxmin_float_t weight_value,
+                               xbt_maxmin_float_t bound,

                                int number_of_constraints);
 void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);
                                int number_of_constraints);
 void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);

-FLOAT lmm_variable_getvalue(lmm_variable_t var);
+xbt_maxmin_float_t lmm_variable_getvalue(lmm_variable_t var);

 
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,

-               lmm_variable_t var, FLOAT value);
+               lmm_variable_t var, xbt_maxmin_float_t value);

 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,

-               lmm_variable_t var, FLOAT value);
-void lmm_update_variable_bound(lmm_variable_t var, FLOAT bound);
-void lmm_update_variable_weight(lmm_variable_t var, FLOAT weight);
-void lmm_update_constraint_bound(lmm_constraint_t cnst, FLOAT bound);
+               lmm_variable_t var, xbt_maxmin_float_t value);
+void lmm_update_variable_bound(lmm_variable_t var,
+                              xbt_maxmin_float_t bound);
+void lmm_update_variable_weight(lmm_variable_t var,
+                               xbt_maxmin_float_t weight);
+void lmm_update_constraint_bound(lmm_constraint_t cnst,
+                                xbt_maxmin_float_t bound);

 
 void lmm_solve(lmm_system_t sys);
 
 void lmm_solve(lmm_system_t sys);

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index a35bfff..a921063 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -81,7 +81,7 @@ static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,

-                                   FLOAT bound_value)
+                                   xbt_maxmin_float_t bound_value)

 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;
 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;


@@ -109,7 +109,8 @@ void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
 }
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
 }
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,

-                               FLOAT weight, FLOAT bound,
+                               xbt_maxmin_float_t weight,
+                               xbt_maxmin_float_t bound,

                                int number_of_constraints)
 {
   lmm_variable_t var = NULL;
                                int number_of_constraints)
 {
   lmm_variable_t var = NULL;


@@ -124,7 +125,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   var->value = -1;
   insert_variable(sys, var);
 
   var->value = -1;
   insert_variable(sys, var);
 

-  var->id=id;
+  var->id = id;

 
   return var;
 }
 
   return var;
 }


@@ -135,13 +136,13 @@ void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
   lmm_var_free(sys, var);
 }
 
   lmm_var_free(sys, var);
 }
 

-FLOAT lmm_variable_getvalue(lmm_variable_t var)
+xbt_maxmin_float_t lmm_variable_getvalue(lmm_variable_t var)

 {
 {

-  return(var->value);
+  return (var->value);

 }
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 }
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,

-                          lmm_variable_t var, FLOAT value)
+               lmm_variable_t var, xbt_maxmin_float_t value)

 {
   lmm_element_t elem = NULL;
 
 {
   lmm_element_t elem = NULL;
 


@@ -161,11 +162,12 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 
 static void saturated_constraints_update(lmm_system_t sys,
                                         lmm_constraint_t cnst,
 
 static void saturated_constraints_update(lmm_system_t sys,
                                         lmm_constraint_t cnst,

-                                        FLOAT * min_usage)
+                                        xbt_maxmin_float_t * min_usage)

 {
 {

-  lmm_constraint_t useless_cnst=NULL;
+  lmm_constraint_t useless_cnst = NULL;

 
 

-  if(cnst->remaining<=0) return;
+  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);
 
   if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
     xbt_swag_t active_elem_list = &(cnst->active_element_set);
 


@@ -188,12 +190,12 @@ static void saturated_variables_update(lmm_system_t sys)
   xbt_swag_t elem_list = NULL;
 
   cnst_list = &(sys->saturated_constraint_set);
   xbt_swag_t elem_list = NULL;
 
   cnst_list = &(sys->saturated_constraint_set);

-  while((cnst=xbt_swag_getFirst(cnst_list))) {
+  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_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_extract(cnst, cnst_list);

   }
 
 }
   }
 
 }


@@ -206,10 +208,10 @@ void lmm_solve(lmm_system_t sys)
   xbt_swag_t cnst_list = NULL;
   xbt_swag_t var_list = NULL;
   xbt_swag_t elem_list = NULL;
   xbt_swag_t cnst_list = NULL;
   xbt_swag_t var_list = NULL;
   xbt_swag_t elem_list = NULL;

-  FLOAT min_usage = -1;
+  xbt_maxmin_float_t min_usage = -1;

 
   /* Init */
 
   /* Init */

-  var_list=&(sys->variable_set);  
+  var_list = &(sys->variable_set);

   xbt_swag_foreach(var, var_list) {
     var->value = -1;
   }
   xbt_swag_foreach(var, var_list) {
     var->value = -1;
   }


@@ -238,23 +240,23 @@ void lmm_solve(lmm_system_t sys)
 
   do {
     /* Fix the variables that have to be */
 
   do {
     /* Fix the variables that have to be */

-    var_list=&(sys->saturated_variable_set);
+    var_list = &(sys->saturated_variable_set);

 
 
     xbt_swag_foreach(var, var_list) {
       /* First check if some of these variables have reach their upper
 
 
     xbt_swag_foreach(var, var_list) {
       /* First check if some of these variables have reach their upper

-        bound and update min_usage accordingly. */
-      if((var->bound>0) && (var->bound / var->weight < min_usage)) {
+         bound and update min_usage accordingly. */
+      if ((var->bound > 0) && (var->bound / var->weight < min_usage)) {

        min_usage = var->bound / var->weight;
       }
     }
 
 
        min_usage = var->bound / var->weight;
       }
     }
 
 

-    while((var=xbt_swag_getFirst(var_list))) {
-      int i ;
+    while ((var = xbt_swag_getFirst(var_list))) {
+      int i;

 
       var->value = min_usage / var->weight;
 
       var->value = min_usage / var->weight;

-      
+

       /* Update usage */
 
       for (i = 0; i < var->cnsts_number; i++) {
       /* Update usage */
 
       for (i = 0; i < var->cnsts_number; i++) {


@@ -264,9 +266,9 @@ void lmm_solve(lmm_system_t sys)
        cnst->usage -= elem->value / var->weight;
        remove_active_elem_in_constraint(elem);
       }
        cnst->usage -= elem->value / var->weight;
        remove_active_elem_in_constraint(elem);
       }

-      xbt_swag_extract(var,var_list);
+      xbt_swag_extract(var, var_list);

     }
     }

-    
+

     /* Find out which variables reach the maximum */
     cnst_list = &(sys->active_constraint_set);
     min_usage = -1;
     /* Find out which variables reach the maximum */
     cnst_list = &(sys->active_constraint_set);
     min_usage = -1;


@@ -281,32 +283,34 @@ void lmm_solve(lmm_system_t sys)
 /* Not a O(1) function */
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
 /* Not a O(1) function */
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,

-               lmm_variable_t var, FLOAT value)
+               lmm_variable_t var, xbt_maxmin_float_t value)

 {
   int i;
   lmm_element_t elem = NULL;
 
   for (i = 0; i < var->cnsts_number; i++)
 {
   int i;
   lmm_element_t elem = NULL;
 
   for (i = 0; i < var->cnsts_number; i++)

-    if(var->cnsts[i].constraint==cnst) {
-      elem->value =value;
+    if (var->cnsts[i].constraint == cnst) {
+      elem->value = value;

       return;
     }
 }
 
       return;
     }
 }
 

-void lmm_update_variable_bound(lmm_variable_t var, FLOAT bound)
+void lmm_update_variable_bound(lmm_variable_t var,
+                              xbt_maxmin_float_t bound)

 {
 {

-  var->bound=bound;
+  var->bound = bound;

 }
 
 }
 

-void lmm_update_variable_weight(lmm_variable_t var, FLOAT weight)
+void lmm_update_variable_weight(lmm_variable_t var,
+                               xbt_maxmin_float_t weight)

 {
 {

-  var->weight=weight;
+  var->weight = weight;

 }
 
 void lmm_update_constraint_bound(lmm_constraint_t cnst,
 }
 
 void lmm_update_constraint_bound(lmm_constraint_t cnst,

-                                FLOAT bound)
+                                xbt_maxmin_float_t bound)

 {
 {

-  cnst->bound=bound;
+  cnst->bound = bound;

 }
 
 
 }
 
 

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 1a1e4e6..0ace8c0 100644 (file)
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -13,7 +13,7 @@ typedef struct lmm_element {
 
   lmm_constraint_t constraint;
   lmm_variable_t variable;
 
   lmm_constraint_t constraint;
   lmm_variable_t variable;

-  FLOAT value;  
+  xbt_maxmin_float_t value;

 } s_lmm_element_t, *lmm_element_t;
 #define insert_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->element_set))
 #define insert_active_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->active_element_set))
 } s_lmm_element_t, *lmm_element_t;
 #define insert_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->element_set))
 #define insert_active_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->active_element_set))


@@ -27,9 +27,9 @@ typedef struct lmm_constraint {
 
   s_xbt_swag_t element_set;    /* a list of lmm_mat_element_t */
   s_xbt_swag_t active_element_set;     /* a list of lmm_mat_element_t */
 
   s_xbt_swag_t element_set;    /* a list of lmm_mat_element_t */
   s_xbt_swag_t active_element_set;     /* a list of lmm_mat_element_t */

-  FLOAT bound;
-  FLOAT remaining;
-  FLOAT usage;
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t remaining;
+  xbt_maxmin_float_t usage;

   char *id;
 } s_lmm_constraint_t;
 
   char *id;
 } s_lmm_constraint_t;
 


@@ -41,9 +41,9 @@ typedef struct lmm_variable {
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;

-  FLOAT weight;
-  FLOAT bound;
-  FLOAT value;
+  xbt_maxmin_float_t weight;
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t value;

   char *id;
 } s_lmm_variable_t;
 
   char *id;
 } s_lmm_variable_t;
 


@@ -54,7 +54,7 @@ typedef struct lmm_system {
   s_xbt_swag_t active_constraint_set;  /* a list of lmm_constraint_t */
 
   s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */
   s_xbt_swag_t active_constraint_set;  /* a list of lmm_constraint_t */
 
   s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */

-  s_xbt_swag_t saturated_constraint_set;/* a list of lmm_constraint_t_t */
+  s_xbt_swag_t saturated_constraint_set;       /* a list of lmm_constraint_t_t */

 } s_lmm_system_t;
 
 #define extract_variable(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
 } s_lmm_system_t;
 
 #define extract_variable(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index b6cea7c..dae1a12 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -21,8 +21,7 @@ xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
   xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
   H->size = init_size;
   H->count = 0;
   xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
   H->size = init_size;
   H->count = 0;

-  H->items =
-      (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);
+  H->items = (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);

   H->free = free_func;
   return H;
 }
   H->free = free_func;
   return H;
 }

diff --git a/src/xbt/swag.c b/src/xbt/swag.c
index f6a8491..42ae4ef 100644 (file)
--- a/src/xbt/swag.c
+++ b/src/xbt/swag.c
@@ -22,7 +22,7 @@
 
 xbt_swag_t xbt_swag_new(size_t offset)
 {
 
 xbt_swag_t xbt_swag_new(size_t offset)
 {

-  xbt_swag_t swag = xbt_new0(s_xbt_swag_t,1);
+  xbt_swag_t swag = xbt_new0(s_xbt_swag_t, 1);

 
   swag->offset = offset;
 
 
   swag->offset = offset;
 


@@ -37,8 +37,9 @@ void xbt_swag_init(xbt_swag_t swag, size_t offset)
 void xbt_swag_insert(void *obj, xbt_swag_t swag)
 {
 
 void xbt_swag_insert(void *obj, xbt_swag_t swag)
 {
 

-  if(xbt_swag_belongs(obj, swag)) return;
-  
+  if (xbt_swag_belongs(obj, swag))
+    return;
+

   (swag->count)++;
   if (swag->head == NULL) {
     swag->head = obj;
   (swag->count)++;
   if (swag->head == NULL) {
     swag->head = obj;


@@ -56,9 +57,10 @@ void *xbt_swag_extract(void *obj, xbt_swag_t swag)
 {
   size_t offset = swag->offset;
 
 {
   size_t offset = swag->offset;
 

-  if (!obj) return NULL;
+  if (!obj)
+    return NULL;

   if (swag->head == swag->tail) {      /* special case */
   if (swag->head == swag->tail) {      /* special case */

-    if (swag->head != obj) /* Trying to remove an object that was not in this swag */
+    if (swag->head != obj)     /* Trying to remove an object that was not in this swag */

       return NULL;
     swag->head = NULL;
     swag->tail = NULL;
       return NULL;
     swag->head = NULL;
     swag->tail = NULL;


@@ -86,5 +88,6 @@ int xbt_swag_size(xbt_swag_t swag)
 
 int xbt_swag_belongs(void *obj, xbt_swag_t swag)
 {
 
 int xbt_swag_belongs(void *obj, xbt_swag_t swag)
 {

-  return ((NEXT(obj, swag->offset)) || (PREV(obj, swag->offset)) || (swag->head==obj));
+  return ((NEXT(obj, swag->offset)) || (PREV(obj, swag->offset))
+         || (swag->head == obj));

 }
 }