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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
maxmin.cpp
diff --git
a/src/surf/maxmin.cpp
b/src/surf/maxmin.cpp
index
385424c
..
978745f
100644
(file)
--- a/
src/surf/maxmin.cpp
+++ b/
src/surf/maxmin.cpp
@@
-35,7
+35,7
@@
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 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,
+static
inline
void lmm_cnst_free(lmm_system_t sys,
lmm_constraint_t cnst);
static void lmm_on_disabled_var(lmm_system_t sys, lmm_constraint_t cnstr);
lmm_constraint_t cnst);
static void lmm_on_disabled_var(lmm_system_t sys, lmm_constraint_t cnstr);
@@
-120,9
+120,7
@@
void lmm_system_free(lmm_system_t sys)
while ((var = (lmm_variable_t) extract_variable(sys))) {
while ((var = (lmm_variable_t) extract_variable(sys))) {
- XBT_WARN
- ("Variable %p (%d) still in system when freing it: this may be a bug",
- var, var->id_int);
+ XBT_WARN("Variable %d still in system when freing it: this may be a bug", var->id_int);
lmm_var_free(sys, var);
}
lmm_var_free(sys, var);
}
@@
-133,7
+131,7
@@
void lmm_system_free(lmm_system_t sys)
free(sys);
}
free(sys);
}
-static
XBT_INLINE
void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var)
+static
inline
void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var)
{
int i;
int nelements;
{
int i;
int nelements;
@@
-185,7
+183,7
@@
static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
xbt_mallocator_release(sys->variable_mallocator, var);
}
xbt_mallocator_release(sys->variable_mallocator, var);
}
-static
XBT_INLINE
void lmm_cnst_free(lmm_system_t sys,
+static
inline
void lmm_cnst_free(lmm_system_t sys,
lmm_constraint_t cnst)
{
make_constraint_inactive(sys, cnst);
lmm_constraint_t cnst)
{
make_constraint_inactive(sys, cnst);
@@
-258,7
+256,7
@@
int lmm_constraint_sharing_policy(lmm_constraint_t cnst)
* Apparently, this call was designed assuming that constraint would no more have elements in it.
* If this is not the case, assertion will fail, and you need to add calls e.g. to lmm_shrink before effectively removing it.
*/
* Apparently, this call was designed assuming that constraint would no more have elements in it.
* If this is not the case, assertion will fail, and you need to add calls e.g. to lmm_shrink before effectively removing it.
*/
-
XBT_INLINE
void lmm_constraint_free(lmm_system_t sys,
+
inline
void lmm_constraint_free(lmm_system_t sys,
lmm_constraint_t cnst)
{
xbt_assert(!xbt_swag_size(&(cnst->active_element_set)),"Removing constraint but it still has active elements");
lmm_constraint_t cnst)
{
xbt_assert(!xbt_swag_size(&(cnst->active_element_set)),"Removing constraint but it still has active elements");
@@
-612,7
+610,7
@@
void *lmm_variable_id(lmm_variable_t var)
return var->id;
}
return var->id;
}
-static
XBT_INLINE
void saturated_constraint_set_update(double usage,
+static
inline
void saturated_constraint_set_update(double usage,
int cnst_light_num,
dyn_light_t saturated_constraint_set,
double *min_usage)
int cnst_light_num,
dyn_light_t saturated_constraint_set,
double *min_usage)
@@
-634,7
+632,7
@@
static XBT_INLINE void saturated_constraint_set_update(double usage,
}
}
}
}
-static
XBT_INLINE
void saturated_variable_set_update(
+static
inline
void saturated_variable_set_update(
s_lmm_constraint_light_t *cnst_light_tab,
dyn_light_t saturated_constraint_set,
lmm_system_t sys)
s_lmm_constraint_light_t *cnst_light_tab,
dyn_light_t saturated_constraint_set,
lmm_system_t sys)
@@
-1242,13
+1240,13
@@
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));
}
-
XBT_INLINE
lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t
+
inline
lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t
sys)
{
return (lmm_constraint_t)xbt_swag_getFirst(&(sys->active_constraint_set));
}
sys)
{
return (lmm_constraint_t)xbt_swag_getFirst(&(sys->active_constraint_set));
}
-
XBT_INLINE
lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t
+
inline
lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t
sys,
lmm_constraint_t
cnst)
sys,
lmm_constraint_t
cnst)
@@
-1256,14
+1254,6
@@
XBT_INLINE lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t
return (lmm_constraint_t)xbt_swag_getNext(cnst, (sys->active_constraint_set).offset);
}
return (lmm_constraint_t)xbt_swag_getNext(cnst, (sys->active_constraint_set).offset);
}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-XBT_PUBLIC(int) lmm_is_variable_limited_by_latency(lmm_variable_t var)
-{
- return (double_equals(var->bound, var->value, var->bound*sg_maxmin_precision));
-}
-#endif
-
-
/** \brief Update the constraint set propagating recursively to
* other constraints so the system should not be entirely computed.
*
/** \brief Update the constraint set propagating recursively to
* other constraints so the system should not be entirely computed.
*