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
Connect new log categories.
[simgrid.git]
/
src
/
xbt
/
dynar.c
diff --git
a/src/xbt/dynar.c
b/src/xbt/dynar.c
index
d6d4611
..
247a834
100644
(file)
--- a/
src/xbt/dynar.c
+++ b/
src/xbt/dynar.c
@@
-149,7
+149,7
@@
XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar)
{
_sanity_check_dynar(dynar);
- XBT_
DEBUG(
"Reset the dynar %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Reset the dynar %p", (void *) dynar);
if (dynar->free_f) {
xbt_dynar_map(dynar, dynar->free_f);
}
@@
-557,7
+557,7
@@
XBT_INLINE void xbt_dynar_push(xbt_dynar_t const dynar,
XBT_INLINE void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar)
{
_check_populated_dynar(dynar);
- XBT_
DEBUG(
"Pop %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Pop %p", (void *) dynar);
dynar->used--;
return _xbt_dynar_elm(dynar, dynar->used);
}
@@
-567,7
+567,7
@@
XBT_INLINE void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst)
{
/* sanity checks done by remove_at */
- XBT_
DEBUG(
"Pop %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Pop %p", (void *) dynar);
xbt_dynar_remove_at(dynar, dynar->used - 1, dst);
}
@@
-638,11
+638,7
@@
XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar,
XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar,
int_f_cpvoid_cpvoid_t compar_fn)
{
-#ifdef HAVE_MERGESORT
- mergesort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
-#else
qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
-#endif
}
/** @brief Sorts a dynar according to their color assuming elements can have only three colors.