A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No more use of abort.
[simgrid.git]
/
src
/
surf
/
maxmin.c
diff --git
a/src/surf/maxmin.c
b/src/surf/maxmin.c
index
6390b6a
..
01e29f9
100644
(file)
--- a/
src/surf/maxmin.c
+++ b/
src/surf/maxmin.c
@@
-10,6
+10,8
@@
#include "xbt/error.h"
#include "maxmin_private.h"
#include <stdlib.h>
#include "xbt/error.h"
#include "maxmin_private.h"
#include <stdlib.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
+ "Logging specific to the SURF maxminmodule");
lmm_system_t lmm_system_new(void)
{
lmm_system_t lmm_system_new(void)
{
@@
-77,14
+79,14
@@
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
{
static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
{
-/* xbt_assert0(xbt_fifo_size(&(cnst->row)), */
-/* "This list should be empty!"); */
+ xbt_assert0(xbt_swag_size(&(cnst->element_set)),
+ "This list should be empty!");
remove_active_constraint(sys, cnst);
xbt_free(cnst);
}
lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
remove_active_constraint(sys, cnst);
xbt_free(cnst);
}
lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
-
xbt_maxmin_float_t
bound_value)
+
double
bound_value)
{
lmm_constraint_t cnst = NULL;
s_lmm_element_t elem;
{
lmm_constraint_t cnst = NULL;
s_lmm_element_t elem;
@@
-110,9
+112,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,
- xbt_maxmin_float_t weight,
- xbt_maxmin_float_t bound,
- int number_of_constraints)
+ double weight,
+ double bound, int number_of_constraints)
{
lmm_variable_t var = NULL;
{
lmm_variable_t var = NULL;
@@
-123,7
+124,7
@@
lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
/* var->cnsts_number = 0; *//* Useless because of the calloc */
var->weight = weight;
var->bound = bound;
/* var->cnsts_number = 0; *//* Useless because of the calloc */
var->weight = weight;
var->bound = bound;
- var->value =
-1
;
+ var->value =
0.0
;
insert_variable(sys, var);
return var;
insert_variable(sys, var);
return var;
@@
-135,20
+136,20
@@
void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
lmm_var_free(sys, var);
}
lmm_var_free(sys, var);
}
-
xbt_maxmin_float_t
lmm_variable_getvalue(lmm_variable_t var)
+
double
lmm_variable_getvalue(lmm_variable_t var)
{
return (var->value);
}
void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
{
return (var->value);
}
void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
- lmm_variable_t var,
xbt_maxmin_float_t
value)
+ lmm_variable_t var,
double
value)
{
lmm_element_t elem = NULL;
sys->modified = 1;
{
lmm_element_t elem = NULL;
sys->modified = 1;
- if (var->cnsts_number >= var->cnsts_size)
-
abort(
);
+ xbt_assert0(var->cnsts_number >= var->cnsts_size,
+
"Too much constraints"
);
elem = &(var->cnsts[var->cnsts_number++]);
elem = &(var->cnsts[var->cnsts_number++]);
@@
-161,22
+162,28
@@
void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
make_constraint_active(sys, cnst);
}
make_constraint_active(sys, cnst);
}
-lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var, int num)
+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;
+ 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)
{
}
int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
{
- return(var->cnsts_number);
+ return
(var->cnsts_number);
}
}
-lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys, lmm_constraint_t cnst,
- lmm_variable_t *var)
+lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
+ lmm_constraint_t cnst,
+ lmm_variable_t * var)
{
{
- if(!(*var)) xbt_swag_getFirst(&(cnst->element_set));
- else *var=xbt_swag_getNext(*var,cnst->element_set.offset);
+ if (!(*var))
+ xbt_swag_getFirst(&(cnst->element_set));
+ else
+ *var = xbt_swag_getNext(*var, cnst->element_set.offset);
return *var;
}
return *var;
}
@@
-191,19
+198,20
@@
void *lmm_variable_id(lmm_variable_t var)
}
static void saturated_constraint_set_update(lmm_system_t sys,
}
static void saturated_constraint_set_update(lmm_system_t sys,
- lmm_constraint_t cnst,
-
xbt_maxmin_float_t *
min_usage)
+
lmm_constraint_t cnst,
+
double *
min_usage)
{
lmm_constraint_t useless_cnst = NULL;
{
lmm_constraint_t useless_cnst = NULL;
- sys->modified = 1;
-
+ if (cnst->usage <= 0)
+ return;
if (cnst->remaining <= 0)
return;
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
if (cnst->remaining <= 0)
return;
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
- while ((useless_cnst = xbt_swag_getFirst(&(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));
xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
@@
-221,10
+229,10
@@
static void saturated_variable_set_update(lmm_system_t sys)
cnst_list = &(sys->saturated_constraint_set);
while ((cnst = xbt_swag_getFirst(cnst_list))) {
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)
elem_list = &(cnst->active_element_set);
xbt_swag_foreach(elem, elem_list)
- xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ if ((elem->value > 0) && (elem->variable->weight > 0))
+ xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
xbt_swag_remove(cnst, cnst_list);
}
xbt_swag_remove(cnst, cnst_list);
}
@@
-238,14
+246,15
@@
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;
-
xbt_maxmin_float_t
min_usage = -1;
+
double
min_usage = -1;
- if(!(sys->modified)) return;
+ if (!(sys->modified))
+ return;
/* Init */
var_list = &(sys->variable_set);
xbt_swag_foreach(var, var_list) {
/* Init */
var_list = &(sys->variable_set);
xbt_swag_foreach(var, var_list) {
- var->value =
-1
;
+ var->value =
0.0
;
}
}
@@
-258,8
+267,10
@@
void lmm_solve(lmm_system_t sys)
cnst->remaining = cnst->bound;
cnst->usage = 0;
xbt_swag_foreach(elem, elem_list) {
cnst->remaining = cnst->bound;
cnst->usage = 0;
xbt_swag_foreach(elem, elem_list) {
- cnst->usage += elem->value / elem->variable->weight;
- insert_active_elem_in_constraint(elem);
+ if ((elem->value > 0) && (elem->variable->weight > 0)) {
+ cnst->usage += elem->value / elem->variable->weight;
+ insert_active_elem_in_constraint(elem);
+ }
}
/* Saturated constraints update */
}
/* Saturated constraints update */
@@
-317,35
+328,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,
xbt_maxmin_float_t
value)
+ lmm_variable_t var,
double
value)
{
int i;
{
int i;
- lmm_element_t elem = NULL;
sys->modified = 1;
for (i = 0; i < var->cnsts_number; i++)
if (var->cnsts[i].constraint == cnst) {
sys->modified = 1;
for (i = 0; i < var->cnsts_number; i++)
if (var->cnsts[i].constraint == cnst) {
-
elem->
value = value;
+
var->cnsts[i].
value = value;
return;
}
}
void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
return;
}
}
void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
-
xbt_maxmin_float_t
bound)
+
double
bound)
{
sys->modified = 1;
var->bound = bound;
}
void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
{
sys->modified = 1;
var->bound = bound;
}
void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
-
xbt_maxmin_float_t
weight)
+
double
weight)
{
sys->modified = 1;
var->weight = weight;
}
void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
{
sys->modified = 1;
var->weight = weight;
}
void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
-
xbt_maxmin_float_t
bound)
+
double
bound)
{
sys->modified = 1;
cnst->bound = bound;
{
sys->modified = 1;
cnst->bound = bound;
@@
-353,7
+363,7
@@
void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
{
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
{
- return xbt_swag_belongs(cnst,&(sys->active_constraint_set));
+ return xbt_swag_belongs(cnst,
&(sys->active_constraint_set));
}
}